chromeos: Update more code to get signals from powerd.

chrome/browser/chromeos/login/wallpaper_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 112 matching lines @@
 }
 
 // static
 void WallpaperManager::RegisterPrefs(PrefServiceSimple* local_state) {
   local_state->RegisterDictionaryPref(prefs::kUsersWallpaperInfo);
   local_state->RegisterDictionaryPref(kUserWallpapers);
   local_state->RegisterDictionaryPref(kUserWallpapersProperties);
 }
 
 void WallpaperManager::AddObservers() {
+  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
   if (!DBusThreadManager::Get()->GetRootPowerManagerClient()->HasObserver(this))
     DBusThreadManager::Get()->GetRootPowerManagerClient()->AddObserver(this);
   system::TimezoneSettings::GetInstance()->AddObserver(this);
 }
 
 void WallpaperManager::EnsureLoggedInUserWallpaperLoaded() {
   // Some browser tests do not have a shell instance. As no wallpaper is needed
   // in these tests anyway, avoid loading one, preventing crashes and speeding
   // up the tests.
   if (!ash::Shell::HasInstance())
@@ skipping 408 matching lines @@
   ClearWallpaperCache();
   current_wallpaper_path_.clear();
   SetUserWallpaper(last_selected_user_);
 }
 
 // WallpaperManager, private: --------------------------------------------------
 
 WallpaperManager::~WallpaperManager() {
   ClearObsoleteWallpaperPrefs();
   DBusThreadManager::Get()->GetRootPowerManagerClient()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   system::TimezoneSettings::GetInstance()->RemoveObserver(this);
   weak_factory_.InvalidateWeakPtrs();
 }
 
 void WallpaperManager::BatchUpdateWallpaper() {
   NOTIMPLEMENTED();
 }
 
 void WallpaperManager::CacheUsersWallpapers() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 317 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   wallpaper_loader_->Start(wallpaper_path.value(), 0,
                            base::Bind(&WallpaperManager::OnWallpaperDecoded,
                                       base::Unretained(this),
                                       email,
                                       info.layout,
                                       update_wallpaper));
 }
 
+void WallpaperManager::SystemResumed(const base::TimeDelta& sleep_duration) {
+  BatchUpdateWallpaper();
+}
+
 void WallpaperManager::OnResume(const base::TimeDelta& sleep_duration) {
-  BatchUpdateWallpaper();
+  SystemResumed(sleep_duration);
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 void WallpaperManager::ValidateAndLoadWallpaper(
     const std::string& email,
     const WallpaperInfo& info,
     bool update_wallpaper,
     const FilePath& wallpaper_path) {
   FilePath valid_path(wallpaper_path);
   if (!file_util::PathExists(wallpaper_path))
     valid_path = wallpaper_path.AddExtension(".png");
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(&WallpaperManager::StartLoad,
                                      base::Unretained(this),
                                      email,
                                      info,
                                      update_wallpaper,
                                      valid_path));
 }
 
 }  // chromeos