Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4647)

Unified Diff: chrome/browser/plugin_service.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make win and mac compilers happy. Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/plugin_service.cc
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index fbb2fae12b527478090b285b726ba9b5510e3a48..ea73448bda5313418e2a4db2e15584b5047d30b3 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -303,7 +303,7 @@ void PluginService::GetAllowedPluginForOpenChannelToPlugin(
webkit::npapi::WebPluginInfo info;
bool found = GetFirstAllowedPluginInfo(url, mime_type, &info, NULL);
FilePath plugin_path;
- if (found && info.enabled)
+ if (found && webkit::npapi::IsPluginEnabled(info))
plugin_path = FilePath(info.path);
// Now we jump back to the IO thread to finish opening the channel.
@@ -431,6 +431,7 @@ void PluginService::Observe(NotificationType type,
#endif
case NotificationType::PLUGIN_ENABLE_STATUS_CHANGED: {
+ webkit::npapi::PluginList::Singleton()->RefreshPlugins();
PurgePluginListCache(false);
break;
}

Powered by Google App Engine
This is Rietveld 408576698