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.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: review + SetZeroDelays in tests 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

« chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc ('K') | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..fe8a205686fa2438a79e29bab27098ec66cc75e9 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,10 @@ 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()->

Ben Goodger (Google) 2012/08/02 15:38:39 up to prev line

Nikita (slow) 2012/08/02 17:58:57 Done.

+ HasSwitch(switches::kDisableBootAnimation);

+ waiting_for_wallpaper_load_ = !is_registered || !disable_boot_animation;

} else {

waiting_for_wallpaper_load_ = false;

}

@@ -173,6 +177,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();

Ben Goodger (Google) 2012/08/02 15:38:39 move the user_wallpaper.. up to the previous line.

Nikita (slow) 2012/08/02 17:58:57 Done.

if (waiting_for_wallpaper_load_)

StartPostponedWebUI();

registrar_.Remove(this,