Cleanup legacy flags and switches

kLoginScreen
kLoginScreenSize

kAshBootAnimationFunction2
kAshBootAnimationFunction3
kAshDisableBootAnimation2
+ related flags

See also https://gerrit.chromium.org/gerrit/#/c/56735/

BUG=244224
TEST=compiles, existing browser_tests and autotests work
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/16105005

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

17 files changed, 17 insertions, 124 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 62fba9a..c4eccab 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -17,12 +17,6 @@ namespace switches {
 const char kAshAnimateFromBootSplashScreen[] =
     "ash-animate-from-boot-splash-screen";
 
-// Variation of boot animation that uses Tween::EASE_OUT_2.
-const char kAshBootAnimationFunction2[] = "ash-boot-animation-function2";
-
-// Variation of boot animation that uses Tween::EASE_OUT_3.
-const char kAshBootAnimationFunction3[] = "ash-boot-animation-function3";
-
 // Constrains the pointer movement within a root window on desktop.
 const char kAshConstrainPointerToRoot[] = "ash-constrain-pointer-to-root";
 
@@ -42,9 +36,6 @@ const char kAshDisableAutoMaximizing[] = "ash-disable-auto-maximizing";
 const char kAshDisableAutoWindowPlacement[] =
     "ash-enable-auto-window-placement";
 
-// Disables boot animation v2, go back to v1.
-const char kAshDisableBootAnimation2[] = "ash-disable-boot-animation2";
-
 // Disables the limitter to throttle how quickly a user
 // can change display settings.
 const char kAshDisableDisplayChangeLimiter[] =
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 601ec55..75e2374 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -18,14 +18,11 @@ namespace switches {
 
 // Please keep alphabetized.
 ASH_EXPORT extern const char kAshAnimateFromBootSplashScreen[];
-ASH_EXPORT extern const char kAshBootAnimationFunction2[];
-ASH_EXPORT extern const char kAshBootAnimationFunction3[];
 ASH_EXPORT extern const char kAshConstrainPointerToRoot[];
 ASH_EXPORT extern const char kAshCopyHostBackgroundAtBoot[];
 ASH_EXPORT extern const char kAshDebugShortcuts[];
 ASH_EXPORT extern const char kAshDisableAutoMaximizing[];
 ASH_EXPORT extern const char kAshDisableAutoWindowPlacement[];
-ASH_EXPORT extern const char kAshDisableBootAnimation2[];
 ASH_EXPORT extern const char kAshDisableDisplayChangeLimiter[];
 ASH_EXPORT extern const char kAshDisableImmersiveFullscreen[];
 ASH_EXPORT extern const char kAshDisableNewAudioHandler[];
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 45348c7..f490a67 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -9,7 +9,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ -477,13 +476,6 @@ std::vector<ui::LayerAnimationSequence*>
 CreateBrightnessGrayscaleAnimationSequence(float target_value,
                                            base::TimeDelta duration) {
   ui::Tween::Type animation_type = ui::Tween::EASE_OUT;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshBootAnimationFunction2)) {
-    animation_type = ui::Tween::EASE_OUT_2;
-  } else if (CommandLine::ForCurrentProcess()->HasSwitch(
-                  ash::switches::kAshBootAnimationFunction3)) {
-    animation_type = ui::Tween::EASE_OUT_3;
-  }
   scoped_ptr<ui::LayerAnimationSequence> brightness_sequence(
       new ui::LayerAnimationSequence());
   scoped_ptr<ui::LayerAnimationSequence> grayscale_sequence(
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e6a2802..b45cfaa 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7010,24 +7010,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION" desc="Description for the flag to disable wallpaper boot animation (except for OOBE).">
           Disables wallpaper boot animation (except for OOBE case).
         </message>
-        <message name="IDS_FLAGS_DISABLE_BOOT_ANIMATION2" desc="Name for the flag to go back to wallpaper boot animation v1.">
-          Disable boot animation v2 (go back to v1).
-        </message>
-        <message name="IDS_FLAGS_DISABLE_BOOT_ANIMATION2_DESCRIPTION" desc="Description for the flag to go back to wallpaper boot animation v2.">
-          Disables wallpaper boot animation v2 - goes back to v1 (except for OOBE case) i.e. login UI is not shown till animation is complete.
-        </message>
-        <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION" desc="Name for the flag to switch wallpaper boot animation function.">
-          Boot animation function.
-        </message>
-        <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION" desc="Description for the flag to switch wallpaper boot animation function.">
-          Change boot animation function.
-        </message>
-        <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2" desc="Description for the option of boot animation function.">
-          EASE_OUT_2
-        </message>
-        <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3" desc="Description for the option of boot animation function.">
-          EASE_OUT_3
-        </message>
         <message name="IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME" desc="Name for the flag to set to enable Chrome Captive Portal detector.">
           Captive Portal detector.
         </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index fbb1e8d..9b398c5 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -166,13 +166,6 @@ const Experiment::Choice kNaClDebugMaskChoices[] = {
 };
 
 #if defined(OS_CHROMEOS)
-const Experiment::Choice kAshBootAnimationFunction[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2,
-    ash::switches::kAshBootAnimationFunction2, ""},
-  { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3,
-    ash::switches::kAshBootAnimationFunction3, ""}
-};
 
 const Experiment::Choice kChromeCaptivePortalDetectionChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
@@ -1039,20 +1032,6 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation),
   },
   {
-    "disable-boot-animation2",
-    IDS_FLAGS_DISABLE_BOOT_ANIMATION2,
-    IDS_FLAGS_DISABLE_BOOT_ANIMATION2_DESCRIPTION,
-    kOsCrOSOwnerOnly,
-    SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2),
-  },
-  {
-    "boot-animation-fucntion",
-    IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION,
-    IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION,
-    kOsCrOSOwnerOnly,
-    MULTI_VALUE_TYPE(kAshBootAnimationFunction),
-  },
-  {
     "captive-portal-detector",
     IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME,
     IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION,
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 80b41c7..b596d5f 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -215,25 +215,7 @@ bool ShouldAutoLaunchKioskApp(const CommandLine& command_line) {
 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
                                        Profile* profile) {
   if (parsed_command_line.HasSwitch(switches::kLoginManager)) {
-    std::string first_screen =
-        parsed_command_line.GetSwitchValueASCII(switches::kLoginScreen);
-    std::string size_arg =
-        parsed_command_line.GetSwitchValueASCII(switches::kLoginScreenSize);
-    gfx::Size size(0, 0);
-    // Allow the size of the login window to be set explicitly. If not set,
-    // default to the entire screen. This is mostly useful for testing.
-    if (size_arg.size()) {
-      std::vector<std::string> dimensions;
-      base::SplitString(size_arg, ',', &dimensions);
-      if (dimensions.size() == 2) {
-        int width, height;
-        if (base::StringToInt(dimensions[0], &width) &&
-            base::StringToInt(dimensions[1], &height))
-          size.SetSize(width, height);
-      }
-    }
-
-    ShowLoginWizard(first_screen, size);
+    ShowLoginWizard(std::string());
 
     if (KioskModeSettings::Get()->IsKioskModeEnabled())
       InitializeKioskModeScreensaver();
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index d4576ec..74c2f2af 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -200,8 +200,7 @@ IN_PROC_BROWSER_TEST_F(LoginGuestTest, CursorShown) {
 // Verifies the cursor is hidden at startup on login screen.
 IN_PROC_BROWSER_TEST_F(LoginCursorTest, CursorHidden) {
   // Login screen needs to be shown explicitly when running test.
-  chromeos::ShowLoginWizard(chromeos::WizardController::kLoginScreenName,
-                            gfx::Size());
+  chromeos::ShowLoginWizard(chromeos::WizardController::kLoginScreenName);
 
   // Cursor should be hidden at startup
   EXPECT_FALSE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible());
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc
index 34c254f..0953c6b 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/shell.h"
@@ -218,10 +217,6 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
   initialize_webui_hidden_ =
       kHiddenWebUIInitializationDefault && !zero_delay_enabled;
 
-  is_boot_animation2_enabled_ = waiting_for_wallpaper_load_ &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshDisableBootAnimation2);
-
   // Prevents white flashing on OOBE (http://crbug.com/131569).
   aura::Env::GetInstance()->set_render_white_bg(false);
 
@@ -249,9 +244,9 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
                    content::NotificationService::AllSources());
   }
 
-  // In boot-animation2 we want to show login WebUI as soon as possible.
-  if ((waiting_for_user_pods_ || is_boot_animation2_enabled_)
-      && initialize_webui_hidden_) {
+  // When we wait for WebUI to be initialized we wait for one of
+  // these notifications.
+  if (waiting_for_user_pods_ && initialize_webui_hidden_) {
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE,
                    content::NotificationService::AllSources());
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
@@ -779,8 +774,7 @@ void LoginDisplayHostImpl::ResetLoginWindowAndView() {
 
 // Declared in login_wizard.h so that others don't need to depend on our .h.
 // TODO(nkostylev): Split this into a smaller functions.
-void ShowLoginWizard(const std::string& first_screen_name,
-                     const gfx::Size& size) {
+void ShowLoginWizard(const std::string& first_screen_name) {
   if (browser_shutdown::IsTryingToQuit())
     return;
 
@@ -822,7 +816,7 @@ void ShowLoginWizard(const std::string& first_screen_name,
   ui::SetNaturalScroll(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kNaturalScrollDefault));
 
-  gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(size));
+  gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
 
   // Check whether we need to execute OOBE process.
   bool oobe_complete = chromeos::StartupUtils::IsOobeCompleted();
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.h b/chrome/browser/chromeos/login/login_display_host_impl.h
index 162a946..824760d 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.h
+++ b/chrome/browser/chromeos/login/login_display_host_impl.h
@@ -161,9 +161,6 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
   // Login display we are using.
   WebUILoginDisplay* webui_login_display_;
 
-  // True if alternate boot animation is enabled.
-  bool is_boot_animation2_enabled_;
-
   // True if the login display is the current screen.
   bool is_showing_login_;
 
diff --git a/chrome/browser/chromeos/login/login_wizard.h b/chrome/browser/chromeos/login/login_wizard.h
index b0c99b2..dd05267 100644
--- a/chrome/browser/chromeos/login/login_wizard.h
+++ b/chrome/browser/chromeos/login/login_wizard.h
@@ -13,8 +13,8 @@ class Size;
 
 namespace chromeos {
 
-// Shows the Login Wizard.
-void ShowLoginWizard(const std::string& start_screen, const gfx::Size& size);
+// Shows the Chrome OS out-of-box / login UI.
+void ShowLoginWizard(const std::string& start_screen);
 
 }  // namespace chromeos
 
diff --git a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
index e998f9f..1284143 100644
--- a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
+++ b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
@@ -36,7 +36,7 @@ void WizardInProcessBrowserTest::SetUpCommandLine(CommandLine* command_line) {
 void WizardInProcessBrowserTest::SetUpOnMainThread() {
   SetUpWizard();
   if (!screen_name_.empty()) {
-    ShowLoginWizard(screen_name_, gfx::Size(1024, 600));
+    ShowLoginWizard(screen_name_);
     host_ = LoginDisplayHostImpl::default_host();
   }
 }
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index 7acfcde..f6de0a4 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -20,9 +20,10 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
+#include "chrome/browser/chromeos/login/login_display_host.h"
+#include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
@@ -141,9 +142,6 @@ class DeviceLocalAccountTest : public InProcessBrowserTest {
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
     command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
     command_line->AppendSwitchASCII(
-        chromeos::switches::kLoginScreen,
-        chromeos::WizardController::kLoginScreenName);
-    command_line->AppendSwitchASCII(
         switches::kDeviceManagementUrl, test_server_.GetServiceURL().spec());
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
   }
@@ -374,6 +372,10 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, StartSession) {
       chrome::NOTIFICATION_USER_LIST_CHANGED,
       base::Bind(&DisplayNameMatches, user_id_1_, kDisplayName1)).Run();
 
+  chromeos::LoginDisplayHost* host =
+      chromeos::LoginDisplayHostImpl::default_host();
+  ASSERT_TRUE(host);
+  host->StartSignInScreen();
   chromeos::ExistingUserController* controller =
       chromeos::ExistingUserController::current_controller();
   ASSERT_TRUE(controller);
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 6d4c8e0..c0362c5 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -602,7 +602,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     if (has_regular_not_logged_in_users) {
       ash::Shell::GetInstance()->
           desktop_background_controller()->MoveDesktopToLockedContainer();
-      ShowLoginWizard(std::string(), gfx::Size());
+      ShowLoginWizard(std::string());
     }
   }
 
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index ef84dc3..78bf78e 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -157,16 +157,6 @@ const char kLoginPassword[]                 = "login-password";
 // Specifies the profile to use once a chromeos user is logged in.
 const char kLoginProfile[]                  = "login-profile";
 
-// Allows to override the first login screen. The value should be the name of
-// the first login screen to show (see
-// chrome/browser/chromeos/login/login_wizard_view.cc for actual names).
-// Ignored if kLoginManager is not specified. TODO(avayvod): Remove when the
-// switch is no longer needed for testing.
-const char kLoginScreen[]                   = "login-screen";
-
-// Controls the initial login screen size. Pass width,height.
-const char kLoginScreenSize[]               = "login-screen-size";
-
 // Specifies the user which is already logged in.
 const char kLoginUser[]                     = "login-user";
 
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 8c3bca3..efe5c09 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -62,10 +62,6 @@ CHROMEOS_EXPORT extern const char kKioskModeScreensaverPath[];
 CHROMEOS_EXPORT extern const char kLoginManager[];
 CHROMEOS_EXPORT extern const char kLoginPassword[];
 CHROMEOS_EXPORT extern const char kLoginProfile[];
-// TODO(avayvod): Remove this flag when it's unnecessary for testing
-// purposes.
-CHROMEOS_EXPORT extern const char kLoginScreen[];
-CHROMEOS_EXPORT extern const char kLoginScreenSize[];
 CHROMEOS_EXPORT extern const char kLoginUser[];
 CHROMEOS_EXPORT extern const char kNaturalScrollDefault[];
 CHROMEOS_EXPORT extern const char kNoDiscardTabs[];
diff --git a/ui/base/animation/tween.cc b/ui/base/animation/tween.cc
index 2991ae6..ac6fa26 100644
--- a/ui/base/animation/tween.cc
+++ b/ui/base/animation/tween.cc
@@ -44,12 +44,6 @@ double Tween::CalculateValue(Tween::Type type, double state) {
     case EASE_OUT:
       return 1.0 - pow(1.0 - state, 2);
 
-    case EASE_OUT_2:
-      return 1.0 - pow(1.0 - state, 3);
-
-    case EASE_OUT_3:
-      return 1.0 - pow(1.0 - state, 4);
-
     case SMOOTH_IN_OUT:
       return sin(state);
 
diff --git a/ui/base/animation/tween.h b/ui/base/animation/tween.h
index ee7e4a6..6e2f179 100644
--- a/ui/base/animation/tween.h
+++ b/ui/base/animation/tween.h
@@ -17,8 +17,6 @@ class UI_EXPORT Tween {
   enum Type {
     LINEAR,        // Linear.
     EASE_OUT,      // Fast in, slow out (default).
-    EASE_OUT_2,    // Variant of EASE_OUT, that starts out slower.
-    EASE_OUT_3,    // Variant of EASE_OUT_2, that starts out slower.
     EASE_IN,       // Slow in, fast out.
     EASE_IN_2,     // Variant of EASE_IN that starts out slower.
     EASE_IN_OUT,   // Slow in and out, fast in the middle.