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

Merge pull request #1317 from deepak1556/api_window_patch

Browse source 
npapi: warn users loading npapi plugins on unsupported platform
This commit is contained in:
Cheng Zhao 2015-03-27 16:26:03 +08:00
commit 2505f8b8b2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/native_window.cc
View file

@ -459,9 +459,14 @@ void NativeWindow::OverrideWebkitPrefs(const GURL& url,
prefs->experimental_webgl_enabled = b;
if (web_preferences_.Get("webaudio", &b))
prefs->webaudio_enabled = b;
if (web_preferences_.Get("extra-plugin-dirs", &list)) {
auto isSupported = content::PluginService::GetInstance()
->NPAPIPluginsSupported();
if (web_preferences_.Get("extra-plugin-dirs", &list) && isSupported) {
for (size_t i = 0; i < list.size(); ++i)
content::PluginService::GetInstance()->AddExtraPluginDir(list[i]);
} else {
LOG(WARNING) << "NPAPI plugins not supported on this platform";
}
}