Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Unified Diff: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

Issue 10808061: [cros] Flip enable-new-oobe switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/user_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
index f02fe2be9171ec04e8ebaafabc408ec68a458772..6f3cbb42f0e36e6d427a5609c838cc2a903b89bc 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.
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698