Index: chrome/browser/chromeos/login/chrome_restart_request.cc |
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc |
index a31b3f4966945ed6205b934cb219f9cb08f8d351..0402e02f58f924ff625d0a4bfc5d7328d3517409 100644 |
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc |
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc |
@@ -78,8 +78,6 @@ std::string DeriveCommandLine(const GURL& start_url, |
::switches::kDisableForceCompositingMode, |
::switches::kDisableGpuShaderDiskCache, |
::switches::kDisableGpuWatchdog, |
- ::switches::kDisableLoginAnimations, |
- ::switches::kDisableOobeAnimation, |
::switches::kDisablePanelFitting, |
::switches::kDisableSeccompFilterSandbox, |
::switches::kDisableThreadedCompositing, |
@@ -100,9 +98,6 @@ std::string DeriveCommandLine(const GURL& start_url, |
::switches::kEnableVsyncNotification, |
::switches::kForceDeviceScaleFactor, |
::switches::kGpuStartupDialog, |
- ::switches::kHasChromeOSDiamondKey, |
- ::switches::kHasChromeOSKeyboard, |
- ::switches::kNaturalScrollDefault, |
::switches::kNoSandbox, |
::switches::kPpapiFlashArgs, |
::switches::kPpapiFlashInProcess, |
@@ -167,7 +162,12 @@ std::string DeriveCommandLine(const GURL& start_url, |
cc::switches::kUIDisablePartialSwap, |
cc::switches::kUIEnablePerTilePainting, |
chromeos::switches::kDbusStub, |
+ chromeos::switches::kDisableLoginAnimations, |
+ chromeos::switches::kDisableOobeAnimation, |
+ chromeos::switches::kHasChromeOSDiamondKey, |
+ chromeos::switches::kHasChromeOSKeyboard, |
chromeos::switches::kLoginProfile, |
+ chromeos::switches::kNaturalScrollDefault, |
gfx::switches::kEnableBrowserTextSubpixelPositioning, |
gfx::switches::kEnableWebkitTextSubpixelPositioning, |
views::corewm::switches::kNoDropShadows, |