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

chrome/browser/chromeos/login/wallpaper_manager.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/chromeos/login/wallpaper_manager.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 294 matching lines @@
             BrowserThread::UI, FROM_HERE,
             base::Bind(&WallpaperManager::CacheUsersWallpapers,
                        weak_factory_.GetWeakPtr()),
             base::TimeDelta::FromMilliseconds(kCacheWallpaperDelayMs));
       } else {
         should_cache_wallpaper_ = true;
       }
       break;
     }
     case chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED: {
-      NotifyAnimationFinished();
       if (should_cache_wallpaper_) {
         BrowserThread::PostDelayedTask(
             BrowserThread::UI, FROM_HERE,
             base::Bind(&WallpaperManager::CacheUsersWallpapers,
                        weak_factory_.GetWeakPtr()),
             base::TimeDelta::FromMilliseconds(kCacheWallpaperDelayMs));
         should_cache_wallpaper_ = false;
       }
       break;
     }
@@ skipping 273 matching lines @@
   // login. If UpdateWallpaper is called at GAIA login screen, no wallpaper will
   // be set. It could result a black screen on external monitors.
   // See http://crbug.com/265689 for detail.
   if (last_selected_user_.empty()) {
     SetDefaultWallpaper();
     return;
   }
   SetUserWallpaper(last_selected_user_);
 }
 
-void WallpaperManager::AddObserver(WallpaperManager::Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void WallpaperManager::RemoveObserver(WallpaperManager::Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-void WallpaperManager::NotifyAnimationFinished() {
-  FOR_EACH_OBSERVER(
-      Observer, observers_, OnWallpaperAnimationFinished(last_selected_user_));
-}
-
 // WallpaperManager, private: --------------------------------------------------
 
 void WallpaperManager::CacheUsersWallpapers() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UserList users = UserManager::Get()->GetUsers();
 
   if (!users.empty()) {
     UserList::const_iterator it = users.begin();
     // Skip the wallpaper of first user in the list. It should have been cached.
     it++;
@@ skipping 434 matching lines @@
   // |sequence_token_| here.
   wallpaper_loader_->Start(wallpaper_path.value(), 0, sequence_token_,
                            base::Bind(&WallpaperManager::OnWallpaperDecoded,
                                       base::Unretained(this),
                                       email,
                                       info.layout,
                                       update_wallpaper));
 }
 
 }  // namespace chromeos