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 fc5670c4be86f950dbd05ce85868041b9d54bcb6..ed870f187442a06c9fdeeae9eb80deb78c29a5e2 100644 |
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc |
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc |
@@ -654,12 +654,6 @@ void WallpaperManager::DeleteUserWallpapers(const std::string& email) { |
} |
void WallpaperManager::InitializeRegisteredDeviceWallpaper() { |
- if (CrosSettingsProvider::TEMPORARILY_UNTRUSTED == |
- CrosSettings::Get()->PrepareTrustedValues( |
- base::Bind(&WallpaperManager::InitializeRegisteredDeviceWallpaper, |
- base::Unretained(this)))) { |
- return; |
- } |
bshe
2013/01/17 17:09:41
This seems safe to remove if we are fine to change
Nikita (slow)
2013/01/18 13:09:41
That's fine to omit this check on initial show but
|
bool disable_boot_animation = CommandLine::ForCurrentProcess()-> |
HasSwitch(switches::kDisableBootAnimation); |
bool show_users = true; |