Merge pull request #126 from jiahaog/revert-79-flash_support

Revert "flash support #2" Former-commit-id: 4651171c4f9ea696149f289df4ac6fa125c5b690
2016-02-19 01:20:15 +08:00 · 2016-02-19 01:20:15 +08:00 · 738b7b9d5c
parent 69a4d97ac2 fa347cc8b0
commit 738b7b9d5c
2 changed files with 0 additions and 5 deletions
--- a/app/plugins/libpepflashplayer.so.REMOVED.git-id
+++ b/app/plugins/libpepflashplayer.so.REMOVED.git-id
@ -1 +0,0 @@
-6f57ffe565395a28195d111c5f80bcf3e87817b2
--- a/app/src/main.js
+++ b/app/src/main.js
@ -18,10 +18,6 @@ if (appArgs.insecure) {
    app.commandLine.appendSwitch('ignore-certificate-errors');
 }

-// Flash plugin
-app.commandLine.appendSwitch('ppapi-flash-path', path.join(__dirname, '../plugins', 'libpepflashplayer.so'));
-app.commandLine.appendSwitch('ppapi-flash-version', '16.0.0.305');
-
 // do nothing for setDockBadge if not OSX
 let setDockBadge = () => {};