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

Unified Diff: chrome/browser/chromeos/login/session/chrome_session_manager.cc

Issue 2438063002: user_manager: Remove deps on session_manager (Closed)
Patch Set: fix nits in PS1 Created 4 years, 2 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/login/session/chrome_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/chrome_session_manager.cc b/chrome/browser/chromeos/login/session/chrome_session_manager.cc
index 2225291666385dcfb6ccba2a78e3e31ca4fd9440..26fde418705d60e3e7ebb7241cb03b33e5c79d7a 100644
--- a/chrome/browser/chromeos/login/session/chrome_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/chrome_session_manager.cc
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/sys_info.h"
+#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h"
@@ -20,6 +21,8 @@
#include "chromeos/cryptohome/cryptohome_parameters.h"
#include "chromeos/login/user_names.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/user_manager.h"
+#include "content/public/browser/notification_service.h"
namespace chromeos {
@@ -93,4 +96,20 @@ ChromeSessionManager::ChromeSessionManager(
ChromeSessionManager::~ChromeSessionManager() {
}
+void ChromeSessionManager::SessionStarted() {
+ session_manager::SessionManager::SessionStarted();
+ SetSessionState(session_manager::SessionState::ACTIVE);
+
+ // Notifies UserManager so that it can update login state.
+ user_manager::UserManager* user_manager = user_manager::UserManager::Get();
+ if (user_manager)
+ user_manager->OnSessionStarted();
+
+ content::NotificationService::current()->Notify(
+ chrome::NOTIFICATION_SESSION_STARTED,
+ content::Source<session_manager::SessionManager>(this),
+ content::Details<const user_manager::User>(
+ user_manager->GetActiveUser()));
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698