Merge 232142 "Revert 230138 "Delay wallpaper load by 2 * average..."

chrome/browser/chromeos/login/wallpaper_manager.h

Index: chrome/browser/chromeos/login/wallpaper_manager.h
===================================================================
--- chrome/browser/chromeos/login/wallpaper_manager.h	(revision 232150)
+++ chrome/browser/chromeos/login/wallpaper_manager.h	(working copy)
@@ -12,7 +12,6 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/user.h"
@@ -81,12 +80,6 @@
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
-  class Observer {
-   public:
-    virtual ~Observer() {}
-    virtual void OnWallpaperAnimationFinished(const std::string& email) = 0;
-  };
-
   static WallpaperManager* Get();
 
   WallpaperManager();
@@ -195,12 +188,6 @@
   // current display's resolution.
   void UpdateWallpaper();
 
-  // Adds given observer to the list.
-  void AddObserver(Observer* observer);
-
-  // Removes given observer from the list.
-  void RemoveObserver(Observer* observer);
-
  private:
   friend class TestApi;
   friend class WallpaperManagerBrowserTest;
@@ -319,9 +306,6 @@
                  bool update_wallpaper,
                  const base::FilePath& wallpaper_path);
 
-  // Notify all registed observers.
-  void NotifyAnimationFinished();
-
   // The number of loaded wallpapers.
   int loaded_wallpapers_;
 
@@ -358,8 +342,6 @@
 
   content::NotificationRegistrar registrar_;
 
-  ObserverList<Observer> observers_;
-
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };