chrome/browser/chromeos/chrome_browser_main_chromeos.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/chrome_browser_main_chromeos.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: merge Created 8 years, 4 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/chromeos/background/ash_user_wallpaper_delegate.cc ('k') | chrome/browser/chromeos/login/wallpaper_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 6ab7f2908c8532d29f576c7ef9349ff0ae3b2f58..e477bae06cb315cb4683ddb462083c28cf1024d6 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -35,6 +35,7 @@

#include "chrome/browser/chromeos/login/screen_locker.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/login/wallpaper_manager.h"

+#include "chrome/browser/chromeos/login/wizard_controller.h"

#include "chrome/browser/chromeos/low_memory_observer.h"

#include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"

#include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"

@@ -419,6 +420,12 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {

chromeos::CrosLibrary::Get()->GetNetworkLibrary()));

}

+ // Make sure that wallpaper boot transition and other delays in OOBE

+ // are disabled for tests by default.

+ // Individual tests may enable them if they want.

+ if (parsed_command_line().HasSwitch(switches::kTestType))

+ chromeos::WizardController::SetZeroDelays();

// Tests should be able to tune login manager before showing it.

// Thus only show login manager in normal (non-testing) mode.

if (!parameters().ui_task)