Remove unused --disable-oobe-animation flag

BUG=352344 TEST=browser_tests R=nkostylev@chromium.org Review URL: https://codereview.chromium.org/199683002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257162 0039d316-1c4b-4281-b951-d872f2087c98
qweri0p · Mar 14, 2014 · fd6bc60 · fd6bc60
1 parent 7407ad6
commit fd6bc60
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 14 deletions.
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -67,15 +67,11 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
 
     // It is a first boot case now. If kDisableBootAnimation flag
     // is passed, it only disables any transition after OOBE.
-    // |kDisableOobeAnimation| disables OOBE animation for slow hardware.
     bool is_registered = StartupUtils::IsDeviceRegistered();
     const CommandLine* command_line = CommandLine::ForCurrentProcess();
     bool disable_boot_animation = command_line->
         HasSwitch(switches::kDisableBootAnimation);
-    bool disable_oobe_animation = command_line->
-        HasSwitch(switches::kDisableOobeAnimation);
-    if ((!is_registered && disable_oobe_animation) ||
-        (is_registered && disable_boot_animation))
+    if (is_registered && disable_boot_animation)
       return false;
 
     return true;

diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -189,7 +189,6 @@ std::string DeriveCommandLine(const GURL& start_url,
       cc::switches::kUIDisablePartialSwap,
       chromeos::switches::kDbusStub,
       chromeos::switches::kDisableLoginAnimations,
-      chromeos::switches::kDisableOobeAnimation,
       chromeos::switches::kHasChromeOSDiamondKey,
       chromeos::switches::kHasChromeOSKeyboard,
       chromeos::switches::kLoginProfile,

diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -1223,7 +1223,6 @@ class KioskHiddenWebUITest : public KioskTest,
     KioskTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kDeviceRegistered, "1");
     command_line->AppendSwitch(switches::kDisableBootAnimation);
-    command_line->AppendSwitch(switches::kDisableOobeAnimation);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {

diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc
@@ -306,11 +306,8 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
   bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
   bool disable_boot_animation = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableBootAnimation);
-  bool disable_oobe_animation = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableOobeAnimation);
 
   waiting_for_wallpaper_load_ = !zero_delay_enabled &&
-                                (is_registered || !disable_oobe_animation) &&
                                 (!is_registered || !disable_boot_animation);
 
   // For slower hardware we have boot animation disabled so

diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
@@ -64,9 +64,6 @@ const char kDisableVolumeAdjustSound[] = "disable-volume-adjust-sound";
 const char kDisableNetworkPortalNotification[] =
     "disable-network-portal-notification";
 
-// Avoid doing animations upon oobe.
-const char kDisableOobeAnimation[]          = "disable-oobe-animation";
-
 // Disables portal detection and network error handling before auto
 // update.
 const char kDisableOOBEBlockingUpdate[] =

diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
@@ -36,7 +36,6 @@ CHROMEOS_EXPORT extern const char kDisableNetworkPortalNotification[];
 CHROMEOS_EXPORT extern const char kDisableNewChannelSwitcherUI[];
 CHROMEOS_EXPORT extern const char kDisableNewKioskUI[];
 CHROMEOS_EXPORT extern const char kDisableOOBEBlockingUpdate[];
-CHROMEOS_EXPORT extern const char kDisableOobeAnimation[];
 CHROMEOS_EXPORT extern const char kDisableQuickofficeComponentApp[];
 CHROMEOS_EXPORT extern const char kDisableVolumeAdjustSound[];
 CHROMEOS_EXPORT extern const char kEchoExtensionPath[];