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 ed65380a8027904ef74741ff3534adf637f4ca4d..2e32c63b3319d989c559a027f29bdaadf09a01c5 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; |
} |
} |