chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h - Issue 398753004: [cros] Move User class to user_manager component.

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/avatar/user_image_manager_impl.h

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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/avatar/user_image_manager_browsertest.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h

index b35aa0589a22f6071d5938383ae98cc749f14041..1f4b8b042b952a81e9d4b38305f095dda669090d 100644

--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h

+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h

@@ -19,8 +19,8 @@

#include "base/values.h"

#include "chrome/browser/chromeos/login/users/avatar/user_image_loader.h"

#include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"

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

#include "chrome/browser/profiles/profile_downloader_delegate.h"

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

#include "ui/gfx/image/image_skia.h"

class ProfileDownloader;

@@ -144,10 +144,10 @@ class UserImageManagerImpl

void TryToCreateImageSyncObserver();

// Returns immutable version of user with |user_id_|.

- const User* GetUser() const;

+ const user_manager::User* GetUser() const;

// Returns mutable version of user with |user_id_|.

- User* GetUserAndModify() const;

+ user_manager::User* GetUserAndModify() const;

// Returns true if user with |user_id_| is logged in and a regular user.

bool IsUserLoggedInAndRegular() const;