Reintegrate 552 r66225-r66645....

chrome/browser/views/options/content_filter_page_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/browser/views/options/content_filter_page_view.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
@@ skipping 83 matching lines @@
     IDS_COOKIES_ASK_EVERY_TIME_RADIO,
     0,
     0,
     IDS_PLUGIN_ASK_RADIO,
     0,
     IDS_GEOLOCATION_ASK_RADIO,
     IDS_NOTIFICATIONS_ASK_RADIO,
   };
   COMPILE_ASSERT(arraysize(kAskIDs) == CONTENT_SETTINGS_NUM_TYPES,
                  Need_a_setting_for_every_content_settings_type);
-  DCHECK_EQ(arraysize(kAskIDs),
-            static_cast<size_t>(CONTENT_SETTINGS_NUM_TYPES));
   if (content_type_ != CONTENT_SETTINGS_TYPE_COOKIES) {
-    if (kAskIDs[content_type_] != 0) {
+    int askID = kAskIDs[content_type_];
+    if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+        !CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableClickToPlay)) {
+      askID = 0;
+    }
+    if (askID != 0) {
       ask_radio_ = new views::RadioButton(
-          l10n_util::GetString(kAskIDs[content_type_]), radio_button_group);
+          l10n_util::GetString(askID), radio_button_group);
       ask_radio_->set_listener(this);
       ask_radio_->SetMultiLine(true);
       layout->StartRow(0, single_column_set_id);
       layout->AddView(ask_radio_);
       layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     }
   }
 
   static const int kBlockIDs[] = {
     IDS_COOKIES_BLOCK_RADIO,
@@ skipping 98 matching lines @@
     profile()->GetGeolocationContentSettingsMap()->SetDefaultContentSetting(
         default_setting);
   } else if (content_type_ == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
     profile()->GetDesktopNotificationService()->SetDefaultContentSetting(
         default_setting);
   } else {
     profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
         content_type_, default_setting);
   }
 }