Skip to content

Commit

Permalink
⬆️ pepper-flash-plugin.
Browse files Browse the repository at this point in the history
  • Loading branch information
hokein committed May 21, 2016
1 parent 5ae0c42 commit 3a5fd05
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
11 changes: 5 additions & 6 deletions pepper-flash-plugin/main.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
var app = require('app');
var path = require('path');
var BrowserWindow = require('browser-window');
const {app, BrowserWindow} = require('electron');
const path = require('path');

var mainWindow = null;
let mainWindow;

app.on('window-all-closed', function() {
if (process.platform != 'darwin')
app.quit();
});

var ppapi_flash_path = null;
let ppapi_flash_path;

// Specify flash path.
// On Windows, it might be /path/to/pepflashplayer.dll
Expand All @@ -34,5 +33,5 @@ app.on('ready', function() {
'height': 600,
'web-preferences': {'plugins': true}
});
mainWindow.loadUrl('http://www.adobe.com/software/flash/about/');
mainWindow.loadURL('http://www.adobe.com/software/flash/about/');
});
10 changes: 5 additions & 5 deletions pepper-flash-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name" : "pepper-flash-plugin-sample",
"version" : "0.1.0",
"main" : "main.js"
}
{
"name" : "pepper-flash-plugin-sample",
"version" : "1.1.0",
"main" : "main.js"
}
5 changes: 2 additions & 3 deletions pepper-flash-plugin/readme.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Pepper-Flash-Plugin Sample

A sample shows Pepper Flash Plugin usage in Electron. More details can be found
at https://github.com/atom/electron/blob/master/docs/tutorial/using-pepper-flash-plugin.md.
at https://github.com/electron/electron/blob/master/docs/tutorial/using-pepper-flash-plugin.md.

## Run steps

Expand All @@ -15,7 +15,7 @@ If it succees, you can view `You have version X.X.X.X installed` in the sample p
## Ways to find pepper flash plugin

1. Copy from Chrome Browser: you can find the plugin(`Adobe Flash Player`) location
by navigating `chrome:://plugins` in Chrome Browser.
by navigating `chrome://plugins` in Chrome Browser.

2. Manually install Adobe Flash Player from https://get.adobe.com/flashplayer/otherversions/.
Then you can find plugin in the installed directory, ie. On Windows, the directory
Expand All @@ -29,7 +29,6 @@ This means you mixing up the architectures. You need to make the architecture
of flash plugin consitent with Electron you run, e.g., load 32-bit flash plugin
in 32-bit Electron.


## Screenshot

![screenshot](/pepper-flash-plugin/screenshot/screenshot.png)

0 comments on commit 3a5fd05

Please sign in to comment.