Index: chrome/renderer/chrome_content_renderer_client.cc |
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
index d38acae477ef044cf1104dc311c92bcdbb042735..676f782dbe09dbb5b2314447837e758e3e4b7335 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -702,19 +702,11 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( |
if ((status_value == |
ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized || |
- status_value == ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay || |
status_value == ChromeViewHostMsg_GetPluginInfo_Status::kBlocked) && |
observer->IsPluginTemporarilyAllowed(identifier)) { |
status_value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed; |
} |
- // Allow full-screen plug-ins for left-click-to-play. |
- if (status_value == ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay && |
- !frame->parent() && !frame->opener() && |
- frame->document().isPluginDocument()) { |
- status_value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed; |
- } |
- |
#if defined(ENABLE_PLUGINS) |
if (status_value == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed && |
base::CommandLine::ForCurrentProcess()->HasSwitch( |
@@ -916,16 +908,6 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( |
observer->DidBlockContentType(content_type, group_name); |
break; |
} |
- case ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay: { |
- placeholder = create_blocked_plugin( |
- IDR_CLICK_TO_PLAY_PLUGIN_HTML, |
- l10n_util::GetStringFUTF16(IDS_PLUGIN_LOAD, group_name)); |
- placeholder->set_allow_loading(true); |
- RenderThread::Get()->RecordAction( |
- UserMetricsAction("Plugin_ClickToPlay")); |
- observer->DidBlockContentType(content_type, group_name); |
- break; |
- } |
case ChromeViewHostMsg_GetPluginInfo_Status::kBlocked: { |
placeholder = create_blocked_plugin( |
IDR_BLOCKED_PLUGIN_HTML, |