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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 363613004: [cros] Define session_manager component with SessionManager base class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index dd1ecb2bf31281b76c0ff7f6e4f6b82f3812e550..c91bfefba52ca35b5dff1fda805a044a76e3b8bb 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -68,6 +68,7 @@
#include "chromeos/ime/input_method_manager.h"
#include "chromeos/login/login_state.h"
#include "chromeos/settings/timezone_settings.h"
+#include "components/session_manager/core/session_manager.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_frame_host.h"
@@ -1185,9 +1186,13 @@ void ShowLoginWizard(const std::string& first_screen_name) {
// Check whether we need to execute OOBE process.
bool oobe_complete = chromeos::StartupUtils::IsOobeCompleted();
if (!oobe_complete) {
+ g_browser_process->platform_part()->session_manager()->SetSessionState(
+ session_manager::SessionManager::SESSION_STATE_OOBE);
LoginState::Get()->SetLoggedInState(
LoginState::LOGGED_IN_OOBE, LoginState::LOGGED_IN_USER_NONE);
} else {
+ g_browser_process->platform_part()->session_manager()->SetSessionState(
+ session_manager::SessionManager::SESSION_STATE_LOGIN_PRIMARY);
LoginState::Get()->SetLoggedInState(
LoginState::LOGGED_IN_NONE, LoginState::LOGGED_IN_USER_NONE);
}

Powered by Google App Engine
This is Rietveld 408576698