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

Unified Diff: components/user_manager/user_manager_base.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
« no previous file with comments | « components/user_manager/user_manager_base.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/user_manager/user_manager_base.cc
diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc
index f3ddd7d84349e47cf0b9a1a70d448e9fb0607b9c..b4c69a826b741e4431b21c8a0d0d6bb0341b44c1 100644
--- a/components/user_manager/user_manager_base.cc
+++ b/components/user_manager/user_manager_base.cc
@@ -26,7 +26,6 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
-#include "components/session_manager/core/session_manager.h"
#include "components/user_manager/known_user.h"
#include "components/user_manager/remove_user_delegate.h"
#include "components/user_manager/user_type.h"
@@ -250,14 +249,10 @@ void UserManagerBase::SwitchToLastActiveUser() {
last_session_active_account_id_.clear();
}
-void UserManagerBase::SessionStarted() {
+void UserManagerBase::OnSessionStarted() {
DCHECK(task_runner_->RunsTasksOnCurrentThread());
- session_started_ = true;
CallUpdateLoginState();
- session_manager::SessionManager::Get()->SetSessionState(
- session_manager::SessionState::ACTIVE);
-
GetLocalState()->CommitPendingWrite();
}
@@ -591,11 +586,6 @@ bool UserManagerBase::IsLoggedInAsStub() const {
return IsUserLoggedIn() && IsStubAccountId(active_user_->GetAccountId());
}
-bool UserManagerBase::IsSessionStarted() const {
- DCHECK(task_runner_->RunsTasksOnCurrentThread());
- return session_started_;
-}
-
bool UserManagerBase::IsUserNonCryptohomeDataEphemeral(
const AccountId& account_id) const {
// Data belonging to the guest and stub users is always ephemeral.
« no previous file with comments | « components/user_manager/user_manager_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698