chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc - Issue 966333004: Revert of Wallpaper manager now observing user child user status to update default wallpaper.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 966333004: Revert of 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: 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

« no previous file with comments | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 589a1570795d4d3689bfbdc9af13bfb13de07261..a65d9797f6713dcb4d24887d818f9b488815de95 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

@@ -307,16 +307,12 @@

base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);

wallpaper_loader_ = new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC,

task_runner_);

- user_manager::UserManager::Get()->AddSessionStateObserver(this);

}

WallpaperManager::~WallpaperManager() {

// TODO(bshe): Lifetime of WallpaperManager needs more consideration.

// http://crbug.com/171694

DCHECK(!show_user_name_on_signin_subscription_);

- user_manager::UserManager::Get()->RemoveSessionStateObserver(this);

ClearObsoleteWallpaperPrefs();

weak_factory_.InvalidateWeakPtrs();

@@ -955,10 +951,6 @@

return loading_.size();

}

-void WallpaperManager::UserChangedChildStatus(user_manager::User* user) {

- SetUserWallpaperNow(user->email());

void WallpaperManager::OnDefaultWallpaperDecoded(

const base::FilePath& path,

const wallpaper::WallpaperLayout layout,