Fix login visual hitch on chromebook

chrome/browser/chromeos/login/wallpaper_manager.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 79 matching lines @@
 // WallpaperManager, public: ---------------------------------------------------
 
 // static
 WallpaperManager* WallpaperManager::Get() {
   if (!g_wallpaper_manager)
     g_wallpaper_manager = new WallpaperManager();
   return g_wallpaper_manager;
 }
 
 WallpaperManager::WallpaperManager()
-    : loaded_wallpapers_(0),
+    : called_shutdown_(false),
+      loaded_wallpapers_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(wallpaper_loader_(
           new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC))),
       should_cache_wallpaper_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   RestartTimer();
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
                  content::NotificationService::AllSources());
   sequence_token_ = BrowserThread::GetBlockingPool()->
       GetNamedSequenceToken(kWallpaperSequenceTokenName);
   task_runner_ = BrowserThread::GetBlockingPool()->
       GetSequencedTaskRunnerWithShutdownBehavior(
           sequence_token_,
           base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
+  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
+  system::TimezoneSettings::GetInstance()->AddObserver(this);
+  CrosSettings::Get()->AddSettingsObserver(kAccountsPrefShowUserNamesOnSignIn,
+                                           this);
+}
+
+WallpaperManager::~WallpaperManager() {
+  DCHECK(called_shutdown_);
+  ClearObsoleteWallpaperPrefs();
+  weak_factory_.InvalidateWeakPtrs();
+}
+
+void WallpaperManager::Shutdown() {
+  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
+  system::TimezoneSettings::GetInstance()->RemoveObserver(this);
+  CrosSettings::Get()->RemoveSettingsObserver(
+      kAccountsPrefShowUserNamesOnSignIn, this);
+  called_shutdown_ = true;
 }
 
 // static
 void WallpaperManager::RegisterPrefs(PrefServiceSimple* local_state) {
   local_state->RegisterDictionaryPref(prefs::kUsersWallpaperInfo);
   local_state->RegisterDictionaryPref(kUserWallpapers);
   local_state->RegisterDictionaryPref(kUserWallpapersProperties);
 }
 
-void WallpaperManager::AddObservers() {
-  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
-  system::TimezoneSettings::GetInstance()->AddObserver(this);
-}
-
 void WallpaperManager::EnsureLoggedInUserWallpaperLoaded() {
   // Some browser tests do not have a shell instance. As no wallpaper is needed
   // in these tests anyway, avoid loading one, preventing crashes and speeding
   // up the tests.
   if (!ash::Shell::HasInstance())
     return;
 
   WallpaperInfo info;
   if (GetLoggedInUserWallpaperInfo(&info)) {
     // TODO(sschmitz): We need an index for default wallpapers for the new UI.
@@ skipping 114 matching lines @@
       if (should_cache_wallpaper_) {
         BrowserThread::PostDelayedTask(
             BrowserThread::UI, FROM_HERE,
             base::Bind(&WallpaperManager::CacheUsersWallpapers,
                        weak_factory_.GetWeakPtr()),
             base::TimeDelta::FromMilliseconds(kCacheWallpaperDelayMs));
         should_cache_wallpaper_ = false;
       }
       break;
     }
+    case chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED: {
+      if (*content::Details<const std::string>(details).ptr() ==
+          kAccountsPrefShowUserNamesOnSignIn) {
+        InitializeRegisteredDeviceWallpaper();
+      }
+      break;
+    }
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 void WallpaperManager::RemoveUserWallpaperInfo(const std::string& email) {
   PrefService* prefs = g_browser_process->local_state();
   DictionaryPrefUpdate prefs_wallpapers_info_update(prefs,
       prefs::kUsersWallpaperInfo);
   prefs_wallpapers_info_update->RemoveWithoutPathExpansion(email, NULL);
@@ skipping 266 matching lines @@
 }
 
 void WallpaperManager::UpdateWallpaper() {
   ClearWallpaperCache();
   current_wallpaper_path_.clear();
   SetUserWallpaper(last_selected_user_);
 }
 
 // WallpaperManager, private: --------------------------------------------------
 
-WallpaperManager::~WallpaperManager() {
-  ClearObsoleteWallpaperPrefs();
-  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
-  system::TimezoneSettings::GetInstance()->RemoveObserver(this);
-  weak_factory_.InvalidateWeakPtrs();
-}
-
 void WallpaperManager::BatchUpdateWallpaper() {
   NOTIMPLEMENTED();
 }
 
 void WallpaperManager::CacheUsersWallpapers() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UserList users = UserManager::Get()->GetUsers();
 
   if (!users.empty()) {
     UserList::const_iterator it = users.begin();
@@ skipping 70 matching lines @@
 
   base::WorkerPool::PostTask(
       FROM_HERE,
       base::Bind(&WallpaperManager::DeleteWallpaperInList,
                  base::Unretained(this),
                  file_to_remove),
       false);
 }
 
 void WallpaperManager::InitializeRegisteredDeviceWallpaper() {
-  if (CrosSettingsProvider::TEMPORARILY_UNTRUSTED ==
-      CrosSettings::Get()->PrepareTrustedValues(
-          base::Bind(&WallpaperManager::InitializeRegisteredDeviceWallpaper,
-                     base::Unretained(this)))) {
+  if (UserManager::Get()->IsUserLoggedIn())
     return;
-  }
+
   bool disable_boot_animation = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableBootAnimation);
   bool show_users = true;
   bool result = CrosSettings::Get()->GetBoolean(
       kAccountsPrefShowUserNamesOnSignIn, &show_users);
   DCHECK(result) << "Unable to fetch setting "
                  << kAccountsPrefShowUserNamesOnSignIn;
   const chromeos::UserList& users = UserManager::Get()->GetUsers();
   if (!show_users || users.empty()) {
     // Boot into sign in form, preload default wallpaper.
@@ skipping 244 matching lines @@
                           FROM_HERE,
                           base::Bind(&WallpaperManager::StartLoad,
                                      base::Unretained(this),
                                      email,
                                      info,
                                      update_wallpaper,
                                      valid_path));
 }
 
 }  // chromeos