From c677a4468855013527c668788b294e5f3468090a Mon Sep 17 00:00:00 2001 From: Robo Date: Fri, 27 Mar 2015 04:14:01 +0530 Subject: [PATCH] npapi: warn users loading npapi plugins on unsupported platform --- atom/browser/native_window.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index b01c9a4d4ed1..7520ac2dd888 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -458,9 +458,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"; } }