chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.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_sync_observer.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_impl.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.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_sync_observer.h

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

index aedebdcaeb035e59baa9d3fcfbf158e9d47bbf96..503338b41089c0138513122ae304a7681b5e6772 100644

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

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

@@ -43,7 +43,7 @@ class UserImageSyncObserver: public PrefServiceSyncableObserver,

};

public:

- explicit UserImageSyncObserver(const User* user);

+ explicit UserImageSyncObserver(const user_manager::User* user);

virtual ~UserImageSyncObserver();

// Register syncable preference for profile.

@@ -88,7 +88,7 @@ class UserImageSyncObserver: public PrefServiceSyncableObserver,

// If it is allowed to change user image now.

bool CanUpdateLocalImageNow();

- const User* user_;

+ const user_manager::User* user_;

scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;

scoped_ptr<content::NotificationRegistrar> notification_registrar_;

PrefServiceSyncable* prefs_;