Fix login visual hitch on chromebook

chrome/browser/chromeos/login/wallpaper_manager.h

-// 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 
 #include <string>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "base/file_path.h"
@@ skipping 44 matching lines @@
 
 // This class maintains wallpapers for users who have logged into this Chrome
 // OS device.
 class WallpaperManager: public system::TimezoneSettings::Observer,
                         public chromeos::PowerManagerClient::Observer,
                         public content::NotificationObserver {
  public:
   static WallpaperManager* Get();
 
   WallpaperManager();
+  virtual ~WallpaperManager();
+
+  // Indicates imminent shutdown, allowing the WallpaperManager to remove any
+  // observers it has registered.
+  void Shutdown();
 
   // Registers wallpaper manager preferences.
   static void RegisterPrefs(PrefServiceSimple* local_state);
 
-  // Adds PowerManagerClient and TimeZoneSettings observers. It needs to be
-  // added after PowerManagerClient has been initialized.
+  // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers.
   void AddObservers();
 
   // Loads wallpaper asynchronously if the current wallpaper is not the
   // wallpaper of logged in user.
   void EnsureLoggedInUserWallpaperLoaded();
 
   // Clears ONLINE and CUSTOM wallpaper cache.
   void ClearWallpaperCache();
 
   // Gets encoded wallpaper from cache. Returns true if success.
@@ skipping 69 matching lines @@
                                  ash::WallpaperLayout layout);
 
   // Updates current wallpaper. It may switch the size of wallpaper based on the
   // current display's resolution.
   void UpdateWallpaper();
 
  private:
   friend class WallpaperManagerBrowserTest;
   typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
 
-  virtual ~WallpaperManager();
-
   // The number of wallpapers have loaded. For test only.
   int loaded_wallpapers() const { return loaded_wallpapers_; }
 
   // Change the wallpapers for users who choose DAILY wallpaper type. Updates
   // current wallpaper if it changed. This function should be called at exactly
   // at 0am if chromeos device is on.
   void BatchUpdateWallpaper();
 
   // Cache some (or all) logged in users' wallpapers to memory at login
   // screen. It should not compete with first wallpaper loading when boot
@@ skipping 87 matching lines @@
   // Old wallpaper names have a png extension name. However all new wallpapers
   // are saved in jpeg format. We have removed file extension to avoid
   // confusion in this CL (https://codereview.chromium.org/10950014).
   // For wallpapers saved before it, we still need to append png extension to
   // file name.
   void ValidateAndLoadWallpaper(const std::string& email,
                                 const WallpaperInfo& info,
                                 bool update_wallpaper,
                                 const FilePath& wallpaper_path);
 
+  // True if wallpaper manager is not observering other objects.
+  bool no_observers_;
+
   // The number of loaded wallpapers.
   int loaded_wallpapers_;
 
   // Sequence token associated with wallpaper operations.
   base::SequencedWorkerPool::SequenceToken sequence_token_;
 
   // Wallpaper sequenced task runner.
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   // The file path of current loaded/loading custom/online wallpaper.
@@ skipping 18 matching lines @@
   content::NotificationRegistrar registrar_;
 
   base::OneShotTimer<WallpaperManager> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_