diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 08:21:43 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 08:21:43 +0000 |
| commit | e03dc78d55b148fd84c7ae265748e0cc8ac7448e (patch) | |
| tree | 5c44b3df469a771081ba3d430a9fc496048ddb7c /chrome/browser/chromeos/background | |
| parent | 75eda33a79ab30dc52c975dd3f4950585f5c3012 (diff) | |
| download | chromium_src-e03dc78d55b148fd84c7ae265748e0cc8ac7448e.zip chromium_src-e03dc78d55b148fd84c7ae265748e0cc8ac7448e.tar.gz chromium_src-e03dc78d55b148fd84c7ae265748e0cc8ac7448e.tar.bz2 | |
[cros] Flip enable-new-oobe switch.
BUG=129799
TEST=Manual + autotests
Review URL: https://chromiumcodereview.appspot.com/10808061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/background')
| -rw-r--r-- | chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc index f02fe2b..6f3cbb4 100644 --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc @@ -34,8 +34,11 @@ class UserWallpaperDelegate: public ash::UserWallpaperDelegate { } virtual ash::WindowVisibilityAnimationType GetAnimationType() OVERRIDE { - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe)) + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableNewOobe) || + WizardController::IsZeroDelayEnabled()) { return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE; + } bool is_registered = WizardController::IsDeviceRegistered(); // TODO(nkostylev): Figure out whether this would affect autotests as well. |