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

Unified Diff: chrome/browser/resources/chromeos/login/user_pod_row.js

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
Index: chrome/browser/resources/chromeos/login/user_pod_row.js
diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.js b/chrome/browser/resources/chromeos/login/user_pod_row.js
index 83a497883a1247727aaf6b6bedd79d16ebac2645..3ab40dd2fc593101baf4edc1b0d8a05a94f4f5d5 100644
--- a/chrome/browser/resources/chromeos/login/user_pod_row.js
+++ b/chrome/browser/resources/chromeos/login/user_pod_row.js
@@ -33,7 +33,7 @@ cr.define('login', function() {
* @type {number}
* @const
*/
- var WALLPAPER_BOAT_LOAD_DELAY_MS = 500;
+ var WALLPAPER_BOOT_LOAD_DELAY_MS = 500;
/**
* Oauth token status. These must match UserManager::OAuthTokenStatus.
@@ -679,8 +679,10 @@ cr.define('login', function() {
// Boot transition. Delay wallpaper load to remove jank
// happening when wallpaper load is competing for resources with
// login WebUI.
- this.loadWallpaperTimeout_ = window.setTimeout(
- this.loadWallpaper_.bind(this), WALLPAPER_BOAT_LOAD_DELAY_MS);
+ if (Oobe.getInstance().shouldLoadWallpaperOnBoot()) {
+ this.loadWallpaperTimeout_ = window.setTimeout(
+ this.loadWallpaper_.bind(this), WALLPAPER_BOOT_LOAD_DELAY_MS);
+ }
this.firstShown_ = false;
}
}
« no previous file with comments | « chrome/browser/resources/chromeos/login/display_manager.js ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698