summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/background
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-10 06:25:49 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-10 06:25:49 +0000
commitbca9a7ee39bf817edd4976ef2bf314d26feea11f (patch)
treea6b260a3c1d420878528469d49f4a9764bcee6bc /chrome/browser/chromeos/background
parent9badbe63637a07eb23112f30fda959f849fe923f (diff)
downloadchromium_src-bca9a7ee39bf817edd4976ef2bf314d26feea11f.zip
chromium_src-bca9a7ee39bf817edd4976ef2bf314d26feea11f.tar.gz
chromium_src-bca9a7ee39bf817edd4976ef2bf314d26feea11f.tar.bz2
ash: Add flag to animate transition from boot splash screen.
This adds an --ash-animate-from-boot-splash-screen flag that can be set to tell Ash to grab the Chrome OS boot splash screen and fade from it into the login screen's brightness/grayscale desktop background animation. I'm also making SystemBackgroundController just control a solid-color layer and moving its host-window-grabbing code into a new BootSplashScreen class. BUG=152309 TEST=add --ash-animate-from-boot-splash-screen to /sbin/session_manager_setup.sh, reboot, and see the animation Review URL: https://chromiumcodereview.appspot.com/11362067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/background')
-rw-r--r--chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
index 538176a..9296d98 100644
--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -47,8 +47,14 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
}
virtual ash::WindowVisibilityAnimationType GetAnimationType() OVERRIDE {
+ return ShouldShowInitialAnimation() ?
+ ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE :
+ ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
+ }
+
+ virtual bool ShouldShowInitialAnimation() OVERRIDE {
if (IsNormalWallpaperChange() || boot_animation_finished_)
- return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
+ return false;
// It is a first boot case now. If kDisableBootAnimation flag
// is passed, it only disables any transition after OOBE.
@@ -61,9 +67,9 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
HasSwitch(switches::kDisableOobeAnimation);
if ((!is_registered && disable_oobe_animation) ||
(is_registered && disable_boot_animation))
- return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
+ return false;
- return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE;
+ return true;
}
virtual void UpdateWallpaper() OVERRIDE {