chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h - 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/login/users/avatar/user_image_manager_impl.h

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:

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 1f4b8b042b952a81e9d4b38305f095dda669090d..7390374229dce06c0005a0414811a4463d5c6a60 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

@@ -32,12 +32,12 @@ class SequencedTaskRunner;

namespace user_manager {

class UserImage;

+class UserManager;

}

namespace chromeos {

class UserImageSyncObserver;

-class UserManager;

class UserImageManagerImpl

: public UserImageManager,

@@ -45,7 +45,7 @@ class UserImageManagerImpl

public:

// UserImageManager:

UserImageManagerImpl(const std::string& user_id,

- UserManager* user_manager);

+ user_manager::UserManager* user_manager);

virtual ~UserImageManagerImpl();

virtual void LoadUserImage() OVERRIDE;

@@ -153,7 +153,7 @@ class UserImageManagerImpl

bool IsUserLoggedInAndRegular() const;

// The user manager.

- UserManager* user_manager_;

+ user_manager::UserManager* user_manager_;

// Loader for JPEG user images.

scoped_refptr<UserImageLoader> image_loader_;