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

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

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 403 matching lines @@
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_AUTH_NEEDED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_AUTH_SUPPLIED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_AUTH_CANCELLED,
                  content::NotificationService::AllSources());
-
-  WallpaperManager::Get()->AddObserver(this);
 }
 
 SigninScreenHandler::~SigninScreenHandler() {
-  WallpaperManager::Get()->RemoveObserver(this);
   weak_factory_.InvalidateWeakPtrs();
   SystemKeyEventListener* key_event_listener =
       SystemKeyEventListener::GetInstance();
   if (key_event_listener)
     key_event_listener->RemoveCapsLockObserver(this);
   if (delegate_)
     delegate_->SetWebUIHandler(NULL);
   network_state_informer_->RemoveObserver(this);
 }
 
@@ skipping 841 matching lines @@
 
 void SigninScreenHandler::HandleShutdownSystem() {
   ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown();
 }
 
 void SigninScreenHandler::HandleLoadWallpaper(const std::string& email) {
   if (delegate_)
     delegate_->LoadWallpaper(email);
 }
 
-void SigninScreenHandler::OnWallpaperAnimationFinished(
-    const std::string& email) {
-  CallJS("login.AccountPickerScreen.onWallpaperLoaded", email);
-}
-
 void SigninScreenHandler::HandleRebootSystem() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
 }
 
 void SigninScreenHandler::HandleRemoveUser(const std::string& email) {
   if (!delegate_)
     return;
   delegate_->RemoveUser(email);
   UpdateAddButtonStatus();
 }
@@ skipping 501 matching lines @@
     if (!kiosk_enable_flow_aborted_callback_for_test_.is_null())
       kiosk_enable_flow_aborted_callback_for_test_.Run();
     return;
   }
 
   if (delegate_)
     delegate_->ShowKioskEnableScreen();
 }
 
 }  // namespace chromeos