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

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

Issue 10827169: [cros] OOBE slide animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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/browser_resources.grd ('k') | chrome/browser/resources/chromeos/login/display_manager.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 cef2871547ceae8ec0fa1750a6d509403d658380..64e45886e7e0147631c011c4989635d03eee9631 100644
--- a/chrome/browser/chromeos/login/webui_login_display_host.cc
+++ b/chrome/browser/chromeos/login/webui_login_display_host.cc
@@ -69,8 +69,6 @@ WebUILoginDisplayHost::WebUILoginDisplayHost(const gfx::Rect& background_bounds)
crash_count_(0),
restore_path_(RESTORE_UNKNOWN) {
bool is_registered = WizardController::IsDeviceRegistered();
- // TODO(nkostylev): Add switch to disable wallpaper transition on OOBE.
- // Should be used on test images so that they are not slowed down.
bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe) &&
!zero_delay_enabled) {
@@ -96,6 +94,11 @@ WebUILoginDisplayHost::WebUILoginDisplayHost(const gfx::Rect& background_bounds)
else if (override_type == kWebUIInitPostpone)
initialize_webui_in_parallel_ = false;
}
+
+ // Don't postpone WebUI initialization on first boot, otherwise we miss
+ // initial animation.
+ if (!WizardController::IsOobeCompleted())
+ initialize_webui_in_parallel_ = false;
}
// In case if we're not waiting for wallpaper load,
// |initialize_webui_in_parallel_| value is ignored through the code flow.
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/chromeos/login/display_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698