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

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

Issue 11299304: Callback to function InitializeRegisteredDeviceWallpaper after cros settings can be trusted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix issue for permanently_untrusted situation Created 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698