mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5943 from bbondy/master

Browse source 
Allow obtaining system Pepper Flash path
This commit is contained in:
Cheng Zhao 2016-06-09 01:48:53 +00:00 committed by GitHub
commit b422c47b67
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_app.cc
View file

@ -110,6 +110,8 @@ int GetPathConstant(const std::string& name) {
return chrome::DIR_USER_PICTURES; return chrome::DIR_USER_PICTURES;
else if (name == "videos") else if (name == "videos")
return chrome::DIR_USER_VIDEOS; return chrome::DIR_USER_VIDEOS;
else if (name == "pepperFlashSystemPlugin")
return chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN;
else else
return -1; return -1;
} }

1
docs/api/app.md
View file

@ -346,6 +346,7 @@ You can request the following paths by the name:
* `music` Directory for a user's music. * `music` Directory for a user's music.
* `pictures` Directory for a user's pictures. * `pictures` Directory for a user's pictures.
* `videos` Directory for a user's videos. * `videos` Directory for a user's videos.
* `pepperFlashSystemPlugin` Full path to the system version of the Pepper Flash plugin.
### `app.setPath(name, path)` ### `app.setPath(name, path)`

2
docs/tutorial/using-pepper-flash-plugin.md
View file

@ -41,6 +41,8 @@ app.on('ready', () => {
}); });
``` ```
The path to the system wide Pepper Flash plugin can also be obtained by calling `app.getPath('pepperFlashSystemPlugin')`.
## Enable Flash Plugin in a `<webview>` Tag ## Enable Flash Plugin in a `<webview>` Tag
Add `plugins` attribute to `<webview>` tag. Add `plugins` attribute to `<webview>` tag.