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

chrome/browser/chromeos/login/wallpaper_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 
 #include <string>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "base/files/file_path.h"
 #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"
 #include "chrome/browser/chromeos/login/user_image.h"
 #include "chrome/browser/chromeos/login/user_image_loader.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 48 matching lines @@
     virtual ~TestApi();
 
     base::FilePath current_wallpaper_path();
 
    private:
     WallpaperManager* wallpaper_manager_;  // not owned
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
-  class Observer {
-   public:
-    virtual ~Observer() {}
-    virtual void OnWallpaperAnimationFinished(const std::string& email) = 0;
-  };
-
   static WallpaperManager* Get();
 
   WallpaperManager();
   virtual ~WallpaperManager();
 
   void set_command_line_for_testing(CommandLine* command_line) {
     command_line_for_testing_ = command_line;
   }
 
   // Indicates imminent shutdown, allowing the WallpaperManager to remove any
@@ skipping 88 matching lines @@
   void SetUserWallpaper(const std::string& email);
 
   // Sets wallpaper to |wallpaper|.
   void SetWallpaperFromImageSkia(const gfx::ImageSkia& wallpaper,
                                  ash::WallpaperLayout layout);
 
   // Updates current wallpaper. It may switch the size of wallpaper based on the
   // 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;
   typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
 
   // The number of wallpapers have loaded. For test only.
   int loaded_wallpapers() const { return loaded_wallpapers_; }
 
   // Cache some (or all) logged in users' wallpapers to memory at login
   // screen. It should not compete with first wallpaper loading when boot
@@ skipping 98 matching lines @@
   void SaveWallpaperInternal(const base::FilePath& path, const char* data,
                              int size);
 
   // Starts to load wallpaper at |wallpaper_path|. If |wallpaper_path| is the
   // same as |current_wallpaper_path_|, do nothing. Must be called on UI thread.
   void StartLoad(const std::string& email,
                  const WallpaperInfo& info,
                  bool update_wallpaper,
                  const base::FilePath& wallpaper_path);
 
-  // Notify all registed observers.
-  void NotifyAnimationFinished();
-
   // The number of loaded wallpapers.
   int loaded_wallpapers_;
 
   // Sequence token associated with wallpaper operations.
   base::SequencedWorkerPool::SequenceToken sequence_token_;
 
   // Wallpaper sequenced task runner.
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   // The file path of current loaded/loading custom/online wallpaper.
@@ skipping 16 matching lines @@
 
   bool should_cache_wallpaper_;
 
   scoped_ptr<CrosSettings::ObserverSubscription>
       show_user_name_on_signin_subscription_;
 
   base::WeakPtrFactory<WallpaperManager> weak_factory_;
 
   content::NotificationRegistrar registrar_;
 
-  ObserverList<Observer> observers_;
-
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_