Chromium Code Reviews| Index: chrome/renderer/render_view.cc |
| =================================================================== |
| --- chrome/renderer/render_view.cc (revision 72249) |
| +++ chrome/renderer/render_view.cc (working copy) |
| @@ -2722,6 +2722,25 @@ |
| ContentSetting host_setting = |
| current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS]; |
| + |
| + if (group->RequiresAuthorization() && |
| + !cmd->HasSwitch(switches::kAlwaysAuthorizePlugins) && |
| + plugin_setting == CONTENT_SETTING_ALLOW && |
| + host_setting == CONTENT_SETTING_DEFAULT) { |
|
Bernhard Bauer
2011/01/24 12:56:33
Combined with the changes in HostContentSettingsMa
|
| + // TODO(cevans) - may need some form of "always allow this web site", |
| + // either via an explicit button or integration with the blocked-plugin |
| + // bubble. |
| + Send(new ViewHostMsg_BlockedOutdatedPlugin(routing_id_, |
| + group->GetGroupName(), |
| + GURL())); |
| + return CreatePluginPlaceholder(frame, |
| + params, |
| + *group, |
| + IDR_BLOCKED_PLUGIN_HTML, |
| + IDS_PLUGIN_NOT_AUTHORIZED, |
| + false); |
| + } |
| + |
| if (info.path.value() == webkit::npapi::kDefaultPluginLibraryName || |
| plugin_setting == CONTENT_SETTING_ALLOW || |
| host_setting == CONTENT_SETTING_ALLOW) { |