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

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
===================================================================
--- chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h	(revision 232150)
+++ chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h	(working copy)
@@ -17,7 +17,6 @@
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
@@ -174,8 +173,7 @@
       public LoginDisplayWebUIHandler,
       public SystemKeyEventListener::CapsLockObserver,
       public content::NotificationObserver,
-      public NetworkStateInformer::NetworkStateInformerObserver,
-      public WallpaperManager::Observer {
+      public NetworkStateInformer::NetworkStateInformerObserver {
  public:
   SigninScreenHandler(
       const scoped_refptr<NetworkStateInformer>& network_state_informer,
@@ -203,9 +201,6 @@
   // Required Local State preferences.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
-  // From WallpaperManager::Observer
-  virtual void OnWallpaperAnimationFinished(const std::string& email) OVERRIDE;
-
   void set_kiosk_enable_flow_aborted_callback_for_test(
       const base::Closure& callback) {
     kiosk_enable_flow_aborted_callback_for_test_ = callback;