commit 2ce3f23c801d1a228f03686d16fa1a794deb5047
author bruthig <bruthig@chromium.org> Thu Apr 02 15:21:35 2015
committer Commit bot <commit-bot@chromium.org> Thu Apr 02 15:22:02 2015
tree 4329699520f22af45a3c02111d3b7cebab289da9
parent 13ea371f0db829498545d8fc198073324ffe2d77

Enabled Screen Rotation Animations.

Removed the "slow" animation variants and created a "default" switch value which
is set to the partial rotation animation.

TEST=Manually verified the animations worked for each of the switch values.

BUG=337596

Review URL: https://codereview.chromium.org/1044263003

Cr-Commit-Position: refs/heads/master@{#323493}

chrome/app/generated_resources.grd

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 5a6dabe..b146bc3 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6175,15 +6175,9 @@
         <message name="IDS_ASH_SCREEN_ROTATION_ANIMATION_PARTIAL_ROTATION" desc="Screen rotation animation option.">
           Partial Rotation
         </message>
-        <message name="IDS_ASH_SCREEN_ROTATION_ANIMATION_PARTIAL_ROTATION_SLOW" desc="Screen rotation animation option.">
-          Partial Rotation - Slow
-        </message>
         <message name="IDS_ASH_SCREEN_ROTATION_ANIMATION_FULL_ROTATION" desc="Screen rotation animation option.">
           Full Rotation
         </message>
-        <message name="IDS_ASH_SCREEN_ROTATION_ANIMATION_FULL_ROTATION_SLOW" desc="Screen rotation animation option.">
-          Full Rotation - Slow
-        </message>
         <message name="IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME" desc="Title for the flag which can be used to test the TouchView maximizing mode.">
           Enable TouchView maximizing UI for testing
         </message>

chrome/browser/about_flags.cc

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index b2323fb2..75833e5 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -396,15 +396,16 @@
 
 #if defined(USE_ASH)
 const Experiment::Choice kAshScreenRotationAnimationChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, "", "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+    ash::switches::kAshEnableScreenRotationAnimation,
+    "none" },
   { IDS_ASH_SCREEN_ROTATION_ANIMATION_PARTIAL_ROTATION,
-    ash::switches::kAshEnableScreenRotationAnimation, "partial-rotation" },
-  { IDS_ASH_SCREEN_ROTATION_ANIMATION_PARTIAL_ROTATION_SLOW,
-    ash::switches::kAshEnableScreenRotationAnimation, "partial-rotation-slow" },
+    ash::switches::kAshEnableScreenRotationAnimation,
+    "partial-rotation" },
   { IDS_ASH_SCREEN_ROTATION_ANIMATION_FULL_ROTATION,
-    ash::switches::kAshEnableScreenRotationAnimation, "full-rotation" },
-  { IDS_ASH_SCREEN_ROTATION_ANIMATION_FULL_ROTATION_SLOW,
-    ash::switches::kAshEnableScreenRotationAnimation, "full-rotation-slow" }
+    ash::switches::kAshEnableScreenRotationAnimation,
+    "full-rotation" }
 };
 #endif