Index: chrome/browser/chromeos/login/wallpaper_manager.cc |
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc |
index f73eff1b80a9f7c088db23a06e6bc909808a0d9f..5cb92f8319222cb6883bf7f54ca13773cc1cbce0 100644 |
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc |
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc |
@@ -244,6 +244,12 @@ void WallpaperManager::InitializeWallpaper() { |
if (!WizardController::IsDeviceRegistered()) { |
SetDefaultWallpaper(); |
} else { |
+ if (CrosSettingsProvider::TEMPORARILY_UNTRUSTED == |
bshe
2012/12/04 20:13:14
girard@ and I came up with this to take care of th
bartfab (slow)
2012/12/06 13:57:01
Normally, PERMANENTLY_UNTRUSTED means that we are
|
+ CrosSettings::Get()->PrepareTrustedValues( |
+ base::Bind(&WallpaperManager::InitializeWallpaper, |
+ base::Unretained(this)))) { |
+ return; |
+ } |
bool show_users = true; |
bool result = CrosSettings::Get()->GetBoolean( |
kAccountsPrefShowUserNamesOnSignIn, &show_users); |