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

Unified Diff: chrome/browser/renderer_host/plugin_info_message_filter.cc

Issue 10823434: [6] Moves CreateVersionFromString to plugin_utils and updates the callers. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 2nd CL in series to delete PluginGroup. Created 8 years, 4 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/renderer_host/plugin_info_message_filter.cc
diff --git a/chrome/browser/renderer_host/plugin_info_message_filter.cc b/chrome/browser/renderer_host/plugin_info_message_filter.cc
index 88e1d17b9dc525a17e617b3df86270db3d7f80e9..0a6ce4948952551c7a87c8e0786fa94eccbabaf0 100644
--- a/chrome/browser/renderer_host/plugin_info_message_filter.cc
+++ b/chrome/browser/renderer_host/plugin_info_message_filter.cc
@@ -147,15 +147,13 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
const WebPluginInfo& plugin,
PluginFinder* plugin_finder,
ChromeViewHostMsg_GetPluginInfo_Status* status) const {
- scoped_ptr<webkit::npapi::PluginGroup> group(
- webkit::npapi::PluginList::Singleton()->GetPluginGroup(plugin));
-
+ std::string identifier = PluginInstaller::GetIdentifier(plugin);
ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
bool uses_default_content_setting = true;
// Check plug-in content settings. The primary URL is the top origin URL and
// the secondary URL is the plug-in URL.
GetPluginContentSetting(plugin, params.top_origin_url, params.url,
- group->identifier(), &plugin_setting,
+ identifier, &plugin_setting,
&uses_default_content_setting);
DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
@@ -169,7 +167,7 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
PluginInstaller::SECURITY_STATUS_UP_TO_DATE;
#endif
PluginInstaller* installer =
- plugin_finder->FindPluginWithIdentifier(group->identifier());
+ plugin_finder->FindPluginWithIdentifier(identifier);
if (installer)
plugin_status = installer->GetSecurityStatus(plugin);
// Check if the plug-in is outdated.

Powered by Google App Engine
This is Rietveld 408576698