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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 14756016: Removed visual jank during kiosk app launch caused by default wallpaper loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 f8a981d54b7bb8fc1759dd468ceb678136869a21..2f48601fb7eb845f7c7a8e6c3931d06ca8cebe74 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -618,6 +618,14 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
storage_monitor_.reset(new StorageMonitorCros());
+ // Make sure that wallpaper boot transition and other delays in OOBE
+ // are disabled for tests and kiosk app launch by default.
+ // Individual tests may enable them if they want.
+ if (parsed_command_line().HasSwitch(::switches::kTestType) ||
+ ShouldAutoLaunchKioskApp(parsed_command_line())) {
+ WizardController::SetZeroDelays();
+ }
+
// In Aura builds this will initialize ash::Shell.
ChromeBrowserMainPartsLinux::PreProfileInit();
}
@@ -644,12 +652,6 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
g_browser_process->browser_policy_connector()->
GetNetworkConfigurationUpdater();
- // 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))
- WizardController::SetZeroDelays();
-
// Start loading the machine statistics. Note: if we start loading machine
// statistics early in PreEarlyInitialization() then the crossystem tool
// sometimes hangs for unknown reasons, see http://crbug.com/167671.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698