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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.cc

Issue 2572793003: [Chrome OS] Implement the device wallpaper policy. (Closed)
Patch Set: Rebase. Created 4 years 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 | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/ui/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index 5eb3a38e37ddac1284f909758b87cb75655c9295..74ff645d930fca6436b814e36c45aa86f0e75d12 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -227,8 +227,11 @@ void WebUILoginDisplay::LoadWallpaper(const AccountId& account_id) {
}
void WebUILoginDisplay::LoadSigninWallpaper() {
- WallpaperManager::Get()->SetDefaultWallpaperDelayed(
- user_manager::SignInAccountId());
+ if (!WallpaperManager::Get()->SetDeviceWallpaperIfApplicable(
+ user_manager::SignInAccountId())) {
+ WallpaperManager::Get()->SetDefaultWallpaperDelayed(
+ user_manager::SignInAccountId());
+ }
}
void WebUILoginDisplay::OnSigninScreenReady() {
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698