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

Unified Diff: chrome/browser/chromeos/preferences.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
Index: chrome/browser/chromeos/preferences.h
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index bf8e6e6d8a6a2cce8e97aec3f600e1b795ec0b56..0d24b0596b6aba611fb3bffbcdb7f7ce0960bf0a 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -12,8 +12,8 @@
#include "base/compiler_specific.h"
#include "base/prefs/pref_member.h"
#include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/prefs/pref_service_syncable_observer.h"
+#include "components/user_manager/user_manager.h"
class PrefRegistrySimple;
class PrefService;
@@ -39,7 +39,7 @@ class InputMethodManager;
// When the preferences change, we change the settings to reflect the new value.
class Preferences : public PrefServiceSyncableObserver,
public ash::ShellObserver,
- public UserManager::UserSessionStateObserver {
+ public user_manager::UserManager::UserSessionStateObserver {
public:
Preferences();
explicit Preferences(
@@ -103,7 +103,7 @@ class Preferences : public PrefServiceSyncableObserver,
// Overriden from ash::ShellObserver.
virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE;
- // Overriden form UserManager::UserSessionStateObserver.
+ // Overriden form user_manager::UserManager::UserSessionStateObserver.
virtual void ActiveUserChanged(
const user_manager::User* active_user) OVERRIDE;
« 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