Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: chrome/browser/chromeos/preferences.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
Index: chrome/browser/chromeos/preferences.h
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index 3ba680fdda6ae4bc5ebe2c9b5b33e71af839b3ab..bf8e6e6d8a6a2cce8e97aec3f600e1b795ec0b56 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -52,9 +52,10 @@ class Preferences : public PrefServiceSyncableObserver,
// This method will initialize Chrome OS settings to values in user prefs.
// |user| is the user owning this preferences.
- void Init(PrefServiceSyncable* prefs, const User* user);
+ void Init(PrefServiceSyncable* prefs, const user_manager::User* user);
- void InitUserPrefsForTesting(PrefServiceSyncable* prefs, const User* user);
+ void InitUserPrefsForTesting(PrefServiceSyncable* prefs,
+ const user_manager::User* user);
void SetInputMethodListForTesting();
private:
@@ -103,7 +104,8 @@ class Preferences : public PrefServiceSyncableObserver,
virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE;
// Overriden form UserManager::UserSessionStateObserver.
- virtual void ActiveUserChanged(const User* active_user) OVERRIDE;
+ virtual void ActiveUserChanged(
+ const user_manager::User* active_user) OVERRIDE;
PrefServiceSyncable* prefs_;
@@ -134,7 +136,7 @@ class Preferences : public PrefServiceSyncableObserver,
IntegerPrefMember xkb_auto_repeat_interval_pref_;
// User owning these preferences.
- const User* user_;
+ const user_manager::User* user_;
// Whether user is a primary user.
bool user_is_primary_;
« no previous file with comments | « chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698