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

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

Issue 10388253: Revert 138502 - Move version metadata from PluginGroup into PluginInstaller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
« no previous file with comments | « chrome/browser/plugin_observer.cc ('k') | chrome/browser/resources/plugin_metadata/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/plugin_info_message_filter.cc
===================================================================
--- chrome/browser/renderer_host/plugin_info_message_filter.cc (revision 138513)
+++ chrome/browser/renderer_host/plugin_info_message_filter.cc (working copy)
@@ -158,33 +158,30 @@
&uses_default_content_setting);
DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
-#if defined(ENABLE_PLUGIN_INSTALLATION)
- PluginInstaller::SecurityStatus plugin_status =
- PluginInstaller::SECURITY_STATUS_UP_TO_DATE;
- PluginInstaller* installer =
- plugin_finder->FindPluginWithIdentifier(group->identifier());
- if (installer)
- plugin_status = installer->GetSecurityStatus(plugin);
// Check if the plug-in is outdated.
- if (plugin_status == PluginInstaller::SECURITY_STATUS_OUT_OF_DATE &&
- !allow_outdated_plugins_.GetValue()) {
+ if (group->IsVulnerable(plugin) && !allow_outdated_plugins_.GetValue()) {
if (allow_outdated_plugins_.IsManaged()) {
status->value =
ChromeViewHostMsg_GetPluginInfo_Status::kOutdatedDisallowed;
} else {
- status->value = ChromeViewHostMsg_GetPluginInfo_Status::kOutdatedBlocked;
+ status->value =
+ ChromeViewHostMsg_GetPluginInfo_Status::kOutdatedBlocked;
}
return;
}
+#if defined(ENABLE_PLUGIN_INSTALLATION)
// Check if the plug-in requires authorization.
- if ((plugin_status ==
- PluginInstaller::SECURITY_STATUS_REQUIRES_AUTHORIZATION ||
+ // TODO(bauerb): This should be a plain struct with the plug-in information.
+ PluginInstaller* installer =
+ plugin_finder->FindPluginWithIdentifier(group->identifier());
+ if (((installer && installer->requires_authorization()) ||
PluginService::GetInstance()->IsPluginUnstable(plugin.path)) &&
!always_authorize_plugins_.GetValue() &&
plugin_setting != CONTENT_SETTING_BLOCK &&
uses_default_content_setting) {
- status->value = ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized;
+ status->value =
+ ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized;
return;
}
#endif
« no previous file with comments | « chrome/browser/plugin_observer.cc ('k') | chrome/browser/resources/plugin_metadata/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698