| Index: chrome/browser/chromeos/login/session/restore_after_crash_session_initializer.cc
|
| diff --git a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc b/chrome/browser/chromeos/login/session/restore_after_crash_session_initializer.cc
|
| similarity index 88%
|
| rename from chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc
|
| rename to chrome/browser/chromeos/login/session/restore_after_crash_session_initializer.cc
|
| index bcada230da498f51b2ce620a37775c47be1ac838..ebe5a9e621bb15c69e6498792dbe3049a8f727f8 100644
|
| --- a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.cc
|
| +++ b/chrome/browser/chromeos/login/session/restore_after_crash_session_initializer.cc
|
| @@ -2,7 +2,7 @@
|
| // 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/session/restore_after_crash_session_manager_delegate.h"
|
| +#include "chrome/browser/chromeos/login/session/restore_after_crash_session_initializer.h"
|
|
|
| #include "base/command_line.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| @@ -18,24 +18,25 @@
|
| #include "components/arc/arc_service_manager.h"
|
| #include "components/prefs/pref_member.h"
|
| #include "components/prefs/pref_service.h"
|
| +#include "components/session_manager/core/session_manager.h"
|
| #include "components/user_manager/user_manager.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/common/content_switches.h"
|
|
|
| namespace chromeos {
|
|
|
| -RestoreAfterCrashSessionManagerDelegate::
|
| - RestoreAfterCrashSessionManagerDelegate(Profile* profile,
|
| - const std::string& login_user_id)
|
| +RestoreAfterCrashSessionInitializer::RestoreAfterCrashSessionInitializer(
|
| + Profile* profile,
|
| + const std::string& login_user_id)
|
| : profile_(profile), login_user_id_(login_user_id) {}
|
|
|
| -RestoreAfterCrashSessionManagerDelegate::
|
| - ~RestoreAfterCrashSessionManagerDelegate() {}
|
| +RestoreAfterCrashSessionInitializer::~RestoreAfterCrashSessionInitializer() {}
|
|
|
| -void RestoreAfterCrashSessionManagerDelegate::Start() {
|
| +void RestoreAfterCrashSessionInitializer::Start() {
|
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
|
|
| - session_manager_->SetSessionState(session_manager::SessionState::ACTIVE);
|
| + session_manager::SessionManager::Get()->SetSessionState(
|
| + session_manager::SessionState::ACTIVE);
|
|
|
| // TODO(nkostylev): Identify tests that do not set this kLoginUser flag but
|
| // still rely on "stub user" session. Keeping existing behavior to avoid
|
| @@ -77,7 +78,7 @@ void RestoreAfterCrashSessionManagerDelegate::Start() {
|
| content::Details<Profile>(profile()));
|
|
|
| // This call will set session state to SESSION_STATE_ACTIVE (same one).
|
| - session_manager_->SessionStarted();
|
| + session_manager::SessionManager::Get()->SessionStarted();
|
|
|
| // Now is the good time to retrieve other logged in users for this session.
|
| // First user has been already marked as logged in and active in
|
|
|