| Index: chrome/browser/chromeos/login/session/user_session_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| index 7310bd3482d9e2406b63a1b94923d19d051eaa7a..f414fa482041c2cbd6b1afb581b57a8839755417 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| @@ -436,13 +436,13 @@ bool UserSessionManager::RespectLocalePreference(
|
| }
|
|
|
| void UserSessionManager::AddSessionStateObserver(
|
| - UserSessionStateObserver* observer) {
|
| + chromeos::UserSessionStateObserver* observer) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| session_state_observer_list_.AddObserver(observer);
|
| }
|
|
|
| void UserSessionManager::RemoveSessionStateObserver(
|
| - UserSessionStateObserver* observer) {
|
| + chromeos::UserSessionStateObserver* observer) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| session_state_observer_list_.RemoveObserver(observer);
|
| }
|
| @@ -972,7 +972,7 @@ void UserSessionManager::RestorePendingUserSessions() {
|
| void UserSessionManager::NotifyPendingUserSessionsRestoreFinished() {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| user_sessions_restored_ = true;
|
| - FOR_EACH_OBSERVER(UserSessionStateObserver,
|
| + FOR_EACH_OBSERVER(chromeos::UserSessionStateObserver,
|
| session_state_observer_list_,
|
| PendingUserSessionsRestoreFinished());
|
| }
|
|
|