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

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

Issue 952853002: Wallpaper manager now observing user child user status to update default wallpaper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fixed. Created 5 years, 10 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/users/wallpaper/wallpaper_manager.cc
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
index a65d9797f6713dcb4d24887d818f9b488815de95..589a1570795d4d3689bfbdc9af13bfb13de07261 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
@@ -307,6 +307,8 @@ WallpaperManager::WallpaperManager()
base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
wallpaper_loader_ = new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC,
task_runner_);
+
+ user_manager::UserManager::Get()->AddSessionStateObserver(this);
}
WallpaperManager::~WallpaperManager() {
@@ -314,6 +316,8 @@ WallpaperManager::~WallpaperManager() {
// http://crbug.com/171694
DCHECK(!show_user_name_on_signin_subscription_);
+ user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
+
ClearObsoleteWallpaperPrefs();
weak_factory_.InvalidateWeakPtrs();
}
@@ -951,6 +955,10 @@ size_t WallpaperManager::GetPendingListSizeForTesting() const {
return loading_.size();
}
+void WallpaperManager::UserChangedChildStatus(user_manager::User* user) {
Mr4D (OOO till 08-26) 2015/02/25 15:23:16 This will probably mess up the user animation. If
merkulova 2015/02/25 15:30:14 It's not change between different users. It's a ch
+ SetUserWallpaperNow(user->email());
+}
+
void WallpaperManager::OnDefaultWallpaperDecoded(
const base::FilePath& path,
const wallpaper::WallpaperLayout layout,

Powered by Google App Engine
This is Rietveld 408576698