| Index: chrome/browser/chromeos/login/session/user_session_manager.h
|
| diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
|
| index b370267328b324168c4103887a02b3c2f110fda5..5cd5864dd52d1a9ce384ec2c0b22f2b357781c47 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.h
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.h
|
| @@ -131,8 +131,8 @@ class UserSessionManager
|
| const User* user,
|
| scoped_ptr<locale_util::SwitchLanguageCallback> callback) const;
|
|
|
| - void AddSessionStateObserver(UserSessionStateObserver* observer);
|
| - void RemoveSessionStateObserver(UserSessionStateObserver* observer);
|
| + void AddSessionStateObserver(chromeos::UserSessionStateObserver* observer);
|
| + void RemoveSessionStateObserver(chromeos::UserSessionStateObserver* observer);
|
|
|
| private:
|
| friend struct DefaultSingletonTraits<UserSessionManager>;
|
| @@ -236,7 +236,7 @@ class UserSessionManager
|
| // [user_id] > [user_id_hash]
|
| SessionManagerClient::ActiveSessionsMap pending_user_sessions_;
|
|
|
| - ObserverList<UserSessionStateObserver> session_state_observer_list_;
|
| + ObserverList<chromeos::UserSessionStateObserver> session_state_observer_list_;
|
|
|
| // OAuth2 session related members.
|
|
|
|
|