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

Unified Diff: chrome/browser/chromeos/profiles/profile_helper.h

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: similarity 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/profiles/profile_helper.h
diff --git a/chrome/browser/chromeos/profiles/profile_helper.h b/chrome/browser/chromeos/profiles/profile_helper.h
index f3afc62d6d0f6e1e965410a7f2d571b9df4c96ea..1c11627fda9149a67bfd429c6a73a2580ebb1ab4 100644
--- a/chrome/browser/chromeos/profiles/profile_helper.h
+++ b/chrome/browser/chromeos/profiles/profile_helper.h
@@ -13,7 +13,7 @@
#include "base/files/file_path.h"
#include "chrome/browser/browsing_data/browsing_data_remover.h"
#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "components/user_manager/user_manager.h"
class Profile;
class User;
@@ -39,9 +39,10 @@ namespace chromeos {
// 2. Get profile dir of an active user, used by ProfileManager:
// GetActiveUserProfileDir()
// 3. Get mapping from user_id_hash to Profile instance/profile path etc.
-class ProfileHelper : public BrowsingDataRemover::Observer,
- public OAuth2LoginManager::Observer,
- public UserManager::UserSessionStateObserver {
+class ProfileHelper
+ : public BrowsingDataRemover::Observer,
+ public OAuth2LoginManager::Observer,
+ public user_manager::UserManager::UserSessionStateObserver {
public:
ProfileHelper();
virtual ~ProfileHelper();
@@ -127,12 +128,12 @@ class ProfileHelper : public BrowsingDataRemover::Observer,
// BrowsingDataRemover::Observer implementation:
virtual void OnBrowsingDataRemoverDone() OVERRIDE;
- // UserManager::Observer overrides.
+ // OAuth2LoginManager::Observer overrides.
virtual void OnSessionRestoreStateChanged(
Profile* user_profile,
OAuth2LoginManager::SessionRestoreState state) OVERRIDE;
- // UserManager::UserSessionStateObserver implementation:
+ // user_manager::UserManager::UserSessionStateObserver implementation:
virtual void ActiveUserHashChanged(const std::string& hash) OVERRIDE;
// Associates |user| with profile with the same user_id,

Powered by Google App Engine
This is Rietveld 408576698