Plugin Power Saver: Remove ASK (left C2P). Replace with DETECT.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 684 matching lines @@
     ContentSettingsObserver* observer =
         ContentSettingsObserver::Get(render_frame);
 
     const ContentSettingsType content_type =
         ShouldUseJavaScriptSettingForPlugin(info)
             ? CONTENT_SETTINGS_TYPE_JAVASCRIPT
             : CONTENT_SETTINGS_TYPE_PLUGINS;
 
     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(
             switches::kEnablePluginPowerSaver)) {
       status_value =
           ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent;
     }
 #endif
 
 #if defined(OS_WIN)
@@ skipping 181 matching lines @@
         placeholder->set_allow_loading(true);
         if (info.type != content::WebPluginInfo::PLUGIN_TYPE_NPAPI) {
           render_frame->Send(new ChromeViewHostMsg_BlockedUnauthorizedPlugin(
               render_frame->GetRoutingID(),
               group_name,
               identifier));
         }
         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,
             l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
         placeholder->set_allow_loading(true);
         RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
         observer->DidBlockContentType(content_type, group_name);
         break;
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy: {
@@ skipping 659 matching lines @@
   if (mime_type == content::kBrowserPluginMimeType) {
     return new extensions::ExtensionsGuestViewContainer(render_frame);
   } else {
     return new extensions::MimeHandlerViewContainer(
         render_frame, mime_type, original_url);
   }
 #else
   return NULL;
 #endif
 }