Make the popup blocker on by default. Flip the flag to be a disabling one.

BUG=60090
TEST=On Windows and Mac, when a popup is blocked, there's an animation in the Omnibox.

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

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

4 files changed, 10 insertions, 9 deletions

diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
index 523eb6f..48abf2e 100644
--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
@@ -188,8 +188,8 @@ bool ContentSettingDecoration::UpdateFromTabContents(
     bool has_animated_text =
         content_setting_image_model_->explanatory_string_id();
     // Check if the animation is enabled.
-    bool animation_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableBlockContentAnimation);
+    bool animation_enabled = !CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kDisableBlockContentAnimation);
     if (has_animated_text && animation_enabled && !animation_) {
       // Start animation, its timer will drive reflow. Note the text is
       // cached so it is not allowed to change during the animation.
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index bbc0d76..92f1cb8 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -95,8 +95,8 @@ void ContentSettingImageView::UpdateFromTabContents(TabContents* tab_contents) {
       content_setting_image_model_->explanatory_string_id();
   // Check if the animation is enabled and if the string for animation is
   // available.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableBlockContentAnimation) || !animated_string_id)
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableBlockContentAnimation) || !animated_string_id)
     return;
 
   // Do not start animation if already in progress.
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 2093c69..5f250e6 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -179,6 +179,11 @@ const char kDisableBackgroundNetworking[] = "disable-background-networking";
 // users with many windows/tabs and lots of memory.
 const char kDisableBackingStoreLimit[]      = "disable-backing-store-limit";
 
+// Disables blocked content warning animation. Currently shows animation for
+// blocked pop-ups only.
+const char kDisableBlockContentAnimation[]  =
+    "disable-blocked-content-animation";
+
 // Disables establishing a backup TCP connection if a specified timeout is
 // exceeded.
 const char kDisableConnectBackupJobs[]      = "disable-connect-backup-jobs";
@@ -415,10 +420,6 @@ const char kEnableAuthNegotiatePort[]       = "enable-auth-negotiate-port";
 // Enables the benchmarking extensions.
 const char kEnableBenchmarking[]            = "enable-benchmarking";
 
-// Enables blocked content warning animation. Currently shows animation for
-// blocked pop-ups only.
-const char kEnableBlockContentAnimation[] = "enable-blocked-content-animation";
-
 // In the browser process this switch is used to enable or disable the
 // client-side phishing detection.  In the renderer this switch is only enabled
 // if this switch is enabled in the browser and the user has opted in to UMA
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index dff6717..e54b3a6 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -60,6 +60,7 @@ extern const char kDisableAuthNegotiateCnameLookup[];
 extern const char kDisableBackgroundMode[];
 extern const char kDisableBackgroundNetworking[];
 extern const char kDisableBackingStoreLimit[];
+extern const char kDisableBlockContentAnimation[];
 extern const char kDisableConnectBackupJobs[];
 extern const char kDisableContentPrefetch[];
 extern const char kDisableCustomJumpList[];
@@ -125,7 +126,6 @@ extern const char kEnableAccessibility[];
 extern const char kEnableAeroPeekTabs[];
 extern const char kEnableAuthNegotiatePort[];
 extern const char kEnableBenchmarking[];
-extern const char kEnableBlockContentAnimation[];
 extern const char kEnableClientSidePhishingDetection[];
 extern const char kEnableClearServerData[];
 extern const char kEnableClickToPlay[];