Add SessionStateObserver with ActiveUserChanged()

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/shell.h"
@@ skipping 351 matching lines @@
 
   DCHECK(active_user_);
   active_user_->set_is_active(false);
   user->set_is_active(true);
   active_user_ = user;
 
   // Move the user to the front.
   SetLRUUser(active_user_);
 
   NotifyActiveUserHashChanged(active_user_->username_hash());
-
-  // TODO(nkostylev): Notify session_manager on active user change.
-  // http://crbug.com/230857
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_ACTIVE_USER_CHANGED,
-      content::Source<UserManager>(this),
-      content::Details<const User>(active_user_));
+  NotifyActiveUserChanged(active_user_);
 }
 
 void UserManagerImpl::RestoreActiveSessions() {
   DBusThreadManager::Get()->GetSessionManagerClient()->RetrieveActiveSessions(
       base::Bind(&UserManagerImpl::OnRestoreActiveSessions,
                  base::Unretained(this)));
 }
 
 void UserManagerImpl::SessionStarted() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 858 matching lines @@
   user_image_manager_->UserLoggedIn(UserManager::kRetailModeUserName,
                                     is_current_user_new_,
                                     true);
   WallpaperManager::Get()->SetInitialUserWallpaper(
       UserManager::kRetailModeUserName, false);
 }
 
 void UserManagerImpl::NotifyOnLogin() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   NotifyActiveUserHashChanged(active_user_->username_hash());
+  NotifyActiveUserChanged(active_user_);
 
   UpdateLoginState();
+  // TODO(nkostylev): Deprecate this notification in favor of
+  // ActiveUserChanged() observer call.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::Source<UserManager>(this),
       content::Details<const User>(active_user_));
 
   // Indicate to DeviceSettingsService that the owner key may have become
   // available.
   DeviceSettingsService::Get()->SetUsername(active_user_->email());
 }
 
@@ skipping 328 matching lines @@
       content::Source<UserManager>(this),
       content::NotificationService::NoDetails());
 }
 
 void UserManagerImpl::NotifyMergeSessionStateChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(UserManager::Observer, observer_list_,
                     MergeSessionStateChanged(merge_session_state_));
 }
 
+void UserManagerImpl::NotifyActiveUserChanged(const User* active_user) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  FOR_EACH_OBSERVER(UserManager::UserSessionStateObserver,
+                    session_state_observer_list_,
+                    ActiveUserChanged(active_user));
+}
+
 void UserManagerImpl::NotifyActiveUserHashChanged(const std::string& hash) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(UserManager::UserSessionStateObserver,
                     session_state_observer_list_,
                     ActiveUserHashChanged(hash));
 }
 
 void UserManagerImpl::NotifyPendingUserSessionsRestoreFinished() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   user_sessions_restored_ = true;
@@ skipping 102 matching lines @@
                                       false,          // using_oauth
                                       false,          // has_cookies
                                       true,           // has_active_session
                                       this);
   } else {
     RestorePendingUserSessions();
   }
 }
 
 }  // namespace chromeos