Merge 152060 - Add --disable-oobe-animation flag to disable OOBE animation on slow hardware

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 152109)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -348,9 +348,6 @@
 const char kDisableNonFullscreenMouseLock[] =
     "disable-non-fullscreen-mouse-lock";
 
-// Avoid doing expensive animations upon login.
-const char kDisableLoginAnimations[]        = "disable-login-animations";
-
 // Disables the menu on the NTP for accessing sessions from other devices.
 const char kDisableNTPOtherSessionsMenu[]   = "disable-ntp-other-sessions-menu";
 
@@ -1354,9 +1351,15 @@
 // Disables new WebRTC implementation of user image picker.
 const char kDisableHtml5Camera[]            = "disable-html5-camera";
 
+// Avoid doing expensive animations upon login.
+const char kDisableLoginAnimations[]        = "disable-login-animations";
+
 // Disables new OOBE/sign in design.
 const char kDisableNewOobe[]                = "disable-new-oobe";
 
+// Avoid doing animations upon oobe.
+const char kDisableOobeAnimation[]          = "disable-oobe-animation";
+
 // Enables touchpad three-finger-click as middle button.
 const char kEnableTouchpadThreeFingerClick[]
     = "touchpad-enable-three-finger-click";