| Index: chrome/browser/chromeos/login/wallpaper_manager.h
|
| diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h
|
| index e32280c538abc08b72f7e68554e19db9dde85738..18cbd49e304881acb40a7736ccf731864bfb75d1 100644
|
| --- a/chrome/browser/chromeos/login/wallpaper_manager.h
|
| +++ b/chrome/browser/chromeos/login/wallpaper_manager.h
|
| @@ -121,6 +121,7 @@ class WallpaperManager: public content::NotificationObserver {
|
| virtual ~Observer() {}
|
| virtual void OnWallpaperAnimationFinished(const std::string& user_id) = 0;
|
| virtual void OnUpdateWallpaperForTesting() {}
|
| + virtual void OnPendingListEmptyForTesting() {}
|
| };
|
|
|
| // This is "wallpaper either scheduled to load, or loading right now".
|
| @@ -345,6 +346,7 @@ class WallpaperManager: public content::NotificationObserver {
|
| friend class WallpaperManagerBrowserTest;
|
| friend class WallpaperManagerBrowserTestDefaultWallpaper;
|
| friend class WallpaperManagerPolicyTest;
|
| + friend class WallpaperManagerTestUtils;
|
|
|
| typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
|
|
|
| @@ -479,6 +481,9 @@ class WallpaperManager: public content::NotificationObserver {
|
| PendingWallpaper* GetPendingWallpaper(const std::string& user_id,
|
| bool delayed);
|
|
|
| + // This is called by PendingWallpaper when load is finished.
|
| + void RemovePendingWallpaperFromList(PendingWallpaper* pending);
|
| +
|
| // Calculate delay for next wallpaper load.
|
| // It is usually average wallpaper load time.
|
| // If last wallpaper load happened long ago, timeout should be reduced by
|
|
|