Move click-to-play behind the --enable-click-to-play switch.

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 2178 matching lines @@
 WebPlugin* RenderView::createPlugin(WebFrame* frame,
                                     const WebPluginParams& params) {
   FilePath path;
   std::string actual_mime_type;
   render_thread_->Send(new ViewHostMsg_GetPluginPath(
       params.url, frame->top()->url(), params.mimeType.utf8(), &path,
       &actual_mime_type));
   if (path.value().empty())
     return NULL;
 
-  if (!AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS) &&
-      path.value() != kDefaultPluginLibraryName) {
-    didNotAllowPlugins(frame);
-    return CreatePluginPlaceholder(frame, params);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableClickToPlay)) {
+    if (!AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS) &&
+        path.value() != kDefaultPluginLibraryName) {
+      didNotAllowPlugins(frame);
+      return CreatePluginPlaceholder(frame, params);
+    }
   }
   return CreatePluginInternal(frame, params, actual_mime_type, path);
 }
 
 WebWorker* RenderView::createWorker(WebFrame* frame, WebWorkerClient* client) {
   WebApplicationCacheHostImpl* appcache_host =
       WebApplicationCacheHostImpl::FromFrame(frame);
   int appcache_host_id = appcache_host ? appcache_host->host_id() : 0;
   return new WebWorkerProxy(client, RenderThread::current(), routing_id_,
                             appcache_host_id);
@@ skipping 111 matching lines @@
       AllowContentType(CONTENT_SETTINGS_TYPE_IMAGES))
     return true;
 
   if (IsWhitelistedForContentSettings(frame))
     return true;
 
   DidBlockContentType(CONTENT_SETTINGS_TYPE_IMAGES);
   return false;  // Other protocols fall through here.
 }
 
+bool RenderView::allowPlugins(WebFrame* frame, bool enabled_per_settings) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableClickToPlay)) {
+    return WebFrameClient::allowPlugins(frame, enabled_per_settings);
+  }
+  return (enabled_per_settings &&
+      AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS));
+}
+
+
 void RenderView::loadURLExternally(
     WebFrame* frame, const WebURLRequest& request,
     WebNavigationPolicy policy) {
   GURL referrer(request.httpHeaderField(WebString::fromUTF8("Referer")));
   if (policy == WebKit::WebNavigationPolicyDownload) {
     Send(new ViewHostMsg_DownloadUrl(routing_id_, request.url(), referrer));
   } else {
     OpenURL(request.url(), referrer, policy);
   }
 }
@@ skipping 2848 matching lines @@
     // top level navigation and routed back to the host.
     WebKit::WebFrame* opener = frame->opener();
     if (opener) {
       if (url.GetOrigin() != GURL(opener->url()).GetOrigin())
         return true;
     }
   }
   return false;
 }