chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/background/ash_user_wallpaper_delegate.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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:

Index: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

index 717e495c1d447138ec7e7fdc502ea4d1d86581ee..4dc45846461e77c82730385114f0d80921b990fb 100644

--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

@@ -12,12 +12,12 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"

#include "chrome/browser/chromeos/login/startup_utils.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/login/login_state.h"

#include "components/user_manager/user.h"

+#include "components/user_manager/user_manager.h"

#include "content/public/browser/notification_service.h"

namespace chromeos {

@@ -106,7 +106,7 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {

return false;

}

const user_manager::User* user =

- chromeos::UserManager::Get()->GetActiveUser();

+ user_manager::UserManager::Get()->GetActiveUser();

if (!user)

return false;

if (chromeos::WallpaperManager::Get()->IsPolicyControlled(user->email()))