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

Unified Diff: chrome/browser/chromeos/login/webui_login_display_host.cc

Issue 10834081: Enable wallpaper boot animation for boot into sign in too. Add flag to disable it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
Index: chrome/browser/chromeos/login/webui_login_display_host.cc
diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc
index 5726e60d2b33a2fd97525b631ea0f57c311f64e6..8cb20bd4accf8454a572611224b5009debbe2856 100644
--- a/chrome/browser/chromeos/login/webui_login_display_host.cc
+++ b/chrome/browser/chromeos/login/webui_login_display_host.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/chromeos/login/webui_login_display_host.h"
+#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/window_animations.h"
@@ -61,7 +62,9 @@ WebUILoginDisplayHost::WebUILoginDisplayHost(const gfx::Rect& background_bounds)
bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe) &&
!zero_delay_enabled) {
- waiting_for_wallpaper_load_ = !is_registered;
+ bool disable_boot_animation = CommandLine::ForCurrentProcess()->
+ HasSwitch(switches::kDisableBootAnimation);
+ waiting_for_wallpaper_load_ = !is_registered || !disable_boot_animation;
} else {
waiting_for_wallpaper_load_ = false;
}
@@ -173,6 +176,8 @@ void WebUILoginDisplayHost::Observe(
BaseLoginDisplayHost::Observe(type, source, details);
if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) {
is_wallpaper_loaded_ = true;
+ ash::Shell::GetInstance()->user_wallpaper_delegate()->
+ OnWallpaperBootAnimationFinished();
if (waiting_for_wallpaper_load_)
StartPostponedWebUI();
registrar_.Remove(this,
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698