Flip the default for the cookie prompt to disabled.

BUG=50083
TEST=none

Review URL: http://codereview.chromium.org/3030033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54461 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 20 insertions, 20 deletions

diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.mm b/chrome/browser/cocoa/content_blocked_bubble_controller.mm
index 519278a..8f3d613 100644
--- a/chrome/browser/cocoa/content_blocked_bubble_controller.mm
+++ b/chrome/browser/cocoa/content_blocked_bubble_controller.mm
@@ -362,8 +362,8 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {
 }
 
 - (void)removeInfoButton {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableCookiePrompt)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableCookiePrompt)) {
     // Remove info button and resize vertically.
     int deltaY = NSHeight([infoButton_ frame]);
     [infoButton_ removeFromSuperview];
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.mm b/chrome/browser/cocoa/content_exceptions_window_controller.mm
index 6d0c177a..f8ab91d 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.mm
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.mm
@@ -178,8 +178,8 @@ static ContentExceptionsWindowController*
     model_.reset(new ContentExceptionsTableModel(
         settingsMap_, otrSettingsMap_, settingsType_));
     showSession_ = settingsType_ == CONTENT_SETTINGS_TYPE_COOKIES;
-    disableCookiePrompt_ = CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kDisableCookiePrompt);
+    disableCookiePrompt_ = !CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableCookiePrompt);
     otrAllowed_ = otrSettingsMap != NULL;
     tableObserver_.reset(new UpdatingContentSettingsObserver(self));
     updatesEnabled_ = YES;
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm
index 5949f09..2befeaf 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.mm
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm
@@ -125,8 +125,8 @@ class PrefObserverDisabler {
 
 - (id)initWithProfile:(Profile*)profile {
   DCHECK(profile);
-  disableCookiePrompt_ = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableCookiePrompt);
+  disableCookiePrompt_ = !CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableCookiePrompt);
   NSString* nibpath =
       [mac_util::MainAppBundle() pathForResource:@"ContentSettings"
                                           ofType:@"nib"];
diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc
index 5c9c7e3..88bb04d 100644
--- a/chrome/browser/content_setting_bubble_model.cc
+++ b/chrome/browser/content_setting_bubble_model.cc
@@ -75,8 +75,8 @@ class ContentSettingTitleLinkAndInfoModel
                                       Profile* profile,
                                       ContentSettingsType content_type)
       : ContentSettingTitleAndLinkModel(tab_contents, profile, content_type) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kDisableCookiePrompt))
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableCookiePrompt))
       SetInfoLink();
   }
 
diff --git a/chrome/browser/content_setting_combo_model.cc b/chrome/browser/content_setting_combo_model.cc
index 167693a..5513515 100644
--- a/chrome/browser/content_setting_combo_model.cc
+++ b/chrome/browser/content_setting_combo_model.cc
@@ -31,8 +31,8 @@ const ContentSetting kSessionAskSettings[] = { CONTENT_SETTING_ALLOW,
 
 ContentSettingComboModel::ContentSettingComboModel(bool show_session)
     : show_session_(show_session),
-      disable_cookie_prompt_(CommandLine::ForCurrentProcess()->HasSwitch(
-                             switches::kDisableCookiePrompt)) {
+      disable_cookie_prompt_(!CommandLine::ForCurrentProcess()->HasSwitch(
+                             switches::kEnableCookiePrompt)) {
 }
 
 ContentSettingComboModel::~ContentSettingComboModel() {
diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
index 27afdcd..d51c91d 100644
--- a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
+++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
@@ -66,8 +66,8 @@ void CookieFilterPageGtk::HighlightGroup(OptionsGroup highlight_group) {
 }
 
 GtkWidget* CookieFilterPageGtk::InitCookieStoringGroup() {
-  bool disable_cookie_prompt = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableCookiePrompt);
+  bool disable_cookie_prompt = !CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableCookiePrompt);
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
diff --git a/chrome/browser/host_content_settings_map.cc b/chrome/browser/host_content_settings_map.cc
index ce53c2d..2cf165e 100644
--- a/chrome/browser/host_content_settings_map.cc
+++ b/chrome/browser/host_content_settings_map.cc
@@ -583,8 +583,8 @@ void HostContentSettingsMap::GetSettingsFromDictionary(
       }
     }
   }
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableCookiePrompt)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableCookiePrompt)) {
     // Migrate obsolete cookie prompt mode.
     if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] ==
         CONTENT_SETTING_ASK)
diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc
index 0f3261e..222f0b0 100644
--- a/chrome/browser/views/options/content_filter_page_view.cc
+++ b/chrome/browser/views/options/content_filter_page_view.cc
@@ -103,8 +103,8 @@ void ContentFilterPageView::InitControlLayout() {
   DCHECK_EQ(arraysize(kAskIDs),
             static_cast<size_t>(CONTENT_SETTINGS_NUM_TYPES));
   if (content_type_ != CONTENT_SETTINGS_TYPE_COOKIES ||
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableCookiePrompt)) {
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableCookiePrompt)) {
     if (kAskIDs[content_type_] != 0) {
       ask_radio_ = new views::RadioButton(
           l10n_util::GetString(kAskIDs[content_type_]), radio_button_group);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index faf6480..e6aa0ca 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -123,9 +123,6 @@ const char kDisableBackingStoreLimit[]      = "disable-backing-store-limit";
 // Disable support for cached byte-ranges.
 const char kDisableByteRangeSupport[]       = "disable-byte-range-support";
 
-// Disables the cookie prompt.
-const char kDisableCookiePrompt[]           = "disable-cookie-prompt";
-
 // Disables the custom JumpList on Windows 7.
 const char kDisableCustomJumpList[]         = "disable-custom-jumplist";
 
@@ -307,6 +304,9 @@ const char kEnableCloudPrintProxy[]         = "enable-cloud-print-proxy";
 // Enables the Cloud Print dialog hosting code.
 const char kEnableCloudPrint[]              = "enable-cloud-print";
 
+// Enables the cookie prompt.
+const char kEnableCookiePrompt[ ]           = "enable-cookie-prompt";
+
 // Enables device orientation events.
 const char kEnableDeviceOrientation[]       = "enable-device-orientation";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 8f0f38e..573e6bb 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -49,7 +49,6 @@ extern const char kDisableAudio[];
 extern const char kDisableAuthNegotiateCnameLookup[];
 extern const char kDisableBackingStoreLimit[];
 extern const char kDisableByteRangeSupport[];
-extern const char kDisableCookiePrompt[];
 extern const char kDisableCustomJumpList[];
 extern const char kDisableDatabases[];
 extern const char kDisableDesktopNotifications[];
@@ -102,6 +101,7 @@ extern const char kEnableChromoting[];
 extern const char kEnableClickToPlay[];
 extern const char kEnableCloudPrintProxy[];
 extern const char kEnableCloudPrint[];
+extern const char kEnableCookiePrompt[];
 extern const char kEnableDeviceOrientation[];
 extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExperimentalWebGL[];