chromeos: Update more code to get signals from powerd.

chrome/browser/chromeos/login/wallpaper_manager.h

 // Copyright (c) 2012 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/file_path.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time.h"
 #include "base/timer.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/system/timezone_settings.h"
+#include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/root_power_manager_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/icu/public/i18n/unicode/timezone.h"
 #include "ui/gfx/image/image_skia.h"
 
 class PrefServiceSimple;
 
 namespace base {
 class SequencedTaskRunner;
@@ skipping 19 matching lines @@
 // Name of wallpaper sequence token.
 extern const char kWallpaperSequenceTokenName[];
 
 // File path suffices of resized small or large wallpaper.
 extern const char kSmallWallpaperSuffix[];
 extern const char kLargeWallpaperSuffix[];
 
 // This class maintains wallpapers for users who have logged into this Chrome
 // OS device.
 class WallpaperManager: public system::TimezoneSettings::Observer,
+                        public chromeos::PowerManagerClient::Observer,
                         public chromeos::RootPowerManagerObserver,
                         public content::NotificationObserver {
  public:
   static WallpaperManager* Get();
 
   WallpaperManager();
 
   // Registers wallpaper manager preferences.
   static void RegisterPrefs(PrefServiceSimple* local_state);
 
-  // Adds RootPowerManagerClient and TimeZoneSettings observers. It needs to be
-  // added after RootPowerManagerClient has been initialized.
+  // Adds PowerManagerClient and TimeZoneSettings observers. It needs to be
+  // added after PowerManagerClient has been initialized.
   void AddObservers();
 
   // Loads wallpaper asynchronously if the current wallpaper is not the
   // wallpaper of logged in user.
   void EnsureLoggedInUserWallpaperLoaded();
 
   // Clears ONLINE and CUSTOM wallpaper cache.
   void ClearWallpaperCache();
 
   // Gets encoded wallpaper from cache. Returns true if success.
@@ skipping 160 matching lines @@
   // Saves wallpaper image raw |data| to |path| (absolute path) in file system.
   void SaveWallpaperInternal(const 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 FilePath& wallpaper_path);
 
+  // Overridden from chromeos::PowerManagerObserver.
+  virtual void SystemResumed(const base::TimeDelta& sleep_duration) OVERRIDE;
+
   // Overridden from chromeos::RootPowerManagerObserver.
+  // TODO(derat): Remove this once notifications are sent by powerd.
   virtual void OnResume(const base::TimeDelta& sleep_duration) OVERRIDE;
 
   // Overridden from system::TimezoneSettings::Observer.
   virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE;
 
   // Validates |wallpaper path| and loads corresponding wallpaper. If
   // |wallpaper_path| is not valid, appends png extension to it before loading.
   // Old wallpaper names have a png extension name. However all new wallpapers
   // are saved in jpeg format. We have removed file extension to avoid
   // confusion in this CL (https://codereview.chromium.org/10950014).
@@ skipping 35 matching lines @@
   content::NotificationRegistrar registrar_;
 
   base::OneShotTimer<WallpaperManager> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_