Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(764)

Unified Diff: chrome/browser/chromeos/login/wallpaper_manager.cc

Issue 11824005: chromeos: Update more code to get signals from powerd. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/wallpaper_manager.cc
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc
index e499d5e939dcd457605aaa52feca324c20dea8e9..fc5670c4be86f950dbd05ce85868041b9d54bcb6 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
@@ -130,6 +130,7 @@ void WallpaperManager::RegisterPrefs(PrefServiceSimple* local_state) {
}
void WallpaperManager::AddObservers() {
+ DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
if (!DBusThreadManager::Get()->GetRootPowerManagerClient()->HasObserver(this))
DBusThreadManager::Get()->GetRootPowerManagerClient()->AddObserver(this);
system::TimezoneSettings::GetInstance()->AddObserver(this);
@@ -558,6 +559,7 @@ void WallpaperManager::UpdateWallpaper() {
WallpaperManager::~WallpaperManager() {
ClearObsoleteWallpaperPrefs();
DBusThreadManager::Get()->GetRootPowerManagerClient()->RemoveObserver(this);
+ DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
system::TimezoneSettings::GetInstance()->RemoveObserver(this);
weak_factory_.InvalidateWeakPtrs();
}
@@ -895,10 +897,14 @@ void WallpaperManager::StartLoad(const std::string& email,
update_wallpaper));
}
-void WallpaperManager::OnResume(const base::TimeDelta& sleep_duration) {
+void WallpaperManager::SystemResumed(const base::TimeDelta& sleep_duration) {
BatchUpdateWallpaper();
}
+void WallpaperManager::OnResume(const base::TimeDelta& sleep_duration) {
+ SystemResumed(sleep_duration);
+}
+
void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
RestartTimer();
}

Powered by Google App Engine
This is Rietveld 408576698