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

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: 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..11a0e9c6f27f0436c9762e24052d797cae52a6cb 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::TRUSTED !=
+ CrosSettings::Get()->PrepareTrustedValues(
+ base::Bind(&WallpaperManager::InitializeWallpaper,
+ base::Unretained(this)))) {
+ return;
+ }
Mattias Nissler (ping if slow) 2012/12/04 09:31:18 should this be moved to the top of the function? O
bartfab (slow) 2012/12/04 09:59:39 You will also run into trouble when settings are p
bshe 2012/12/04 18:32:37 I see. How often does the PERMANENTLY_UNTRUSTED si
bshe 2012/12/04 18:32:37 Some of the code path is not depend on the setting
bshe 2012/12/05 14:58:36 bartfab@ Sorry. Please ignore my comment about Ret
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