Reintegrate 552 r66225-r66645....

chrome/browser/gtk/options/content_filter_page_gtk.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/browser/gtk/options/content_filter_page_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
@@ skipping 65 matching lines @@
      0,  // This dialog isn't used for cookies.
      0,
      0,
      IDS_PLUGIN_ASK_RADIO,
      0,
      IDS_GEOLOCATION_ASK_RADIO,
      IDS_NOTIFICATIONS_ASK_RADIO,
   };
   COMPILE_ASSERT(arraysize(kAskIDs) == CONTENT_SETTINGS_NUM_TYPES,
                  kAskIDs_IncorrectSize);
-  if (kAskIDs[content_type_]) {
+  int askID = kAskIDs[content_type_];
+  if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableClickToPlay)) {
+    askID = 0;
+  }
+
+  if (askID) {
     ask_radio_ = gtk_radio_button_new_with_label_from_widget(
         GTK_RADIO_BUTTON(allow_radio_),
-        l10n_util::GetStringUTF8(kAskIDs[content_type_]).c_str());
+        l10n_util::GetStringUTF8(askID).c_str());
     gtk_box_pack_start(GTK_BOX(vbox), ask_radio_, FALSE, FALSE, 0);
   }
 
   static const int kBlockIDs[] = {
     0,  // This dialog isn't used for cookies.
     IDS_IMAGES_NOLOAD_RADIO,
     IDS_JS_DONOTALLOW_RADIO,
     IDS_PLUGIN_NOLOAD_RADIO,
     IDS_POPUP_BLOCK_RADIO,
     IDS_GEOLOCATION_BLOCK_RADIO,
@@ skipping 122 matching lines @@
     return;
   }
   ContentExceptionsWindowGtk::ShowExceptionsWindow(
       GTK_WINDOW(gtk_widget_get_toplevel(button)),
       settings_map, otr_settings_map, content_type_);
 }
 
 void ContentFilterPageGtk::OnPluginsPageLinkClicked(GtkWidget* button) {
   browser::ShowOptionsURL(profile(), GURL(chrome::kChromeUIPluginsURL));
 }