Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h |
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h |
index 536d752dcfb088f21aec427677d048e5cf58592c..1faa368134033f4ee8b6ebb369ff7b204d0e9ffe 100644 |
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h |
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h |
@@ -37,19 +37,22 @@ class WallpaperManager : |
public: |
class PendingWallpaper; |
- WallpaperManager(); |
~WallpaperManager() override; |
- // Get pointer to singleton WallpaperManager instance, create it if necessary. |
+ // Creates an instance of Wallpaper Manager. If there is no instance, create |
+ // one. Otherwise, returns the existing instance. |
+ static void Initialize(); |
+ |
+ // Gets pointer to singleton WallpaperManager instance. |
static WallpaperManager* Get(); |
+ // Deletes the existing instance of WallpaperManager. Allows the |
+ // WallpaperManager to remove any observers it has registered. |
+ static void Shutdown(); |
+ |
// Returns the appropriate wallpaper resolution for all root windows. |
WallpaperResolution GetAppropriateResolution() override; |
- // Indicates imminent shutdown, allowing the WallpaperManager to remove any |
- // observers it has registered. |
- void Shutdown() override; |
- |
// Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers. |
void AddObservers() override; |
@@ -127,6 +130,8 @@ class WallpaperManager : |
friend class WallpaperManagerBrowserTestDefaultWallpaper; |
friend class WallpaperManagerPolicyTest; |
+ WallpaperManager(); |
+ |
// Returns modifiable PendingWallpaper. |
// Returns pending_inactive_ or creates new PendingWallpaper if necessary. |
PendingWallpaper* GetPendingWallpaper(const std::string& user_id, |