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

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

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)
Patch Set: Fix rebase mistake Created 4 years, 1 month 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/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index 9977aef8173de84e07483bf780865473dcd2e787..c2b293b29f8aa75dc92bef663c280126e444d3a2 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -32,7 +32,7 @@
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/base/locale_util.h"
#include "chrome/browser/chromeos/boot_times_recorder.h"
#include "chrome/browser/chromeos/first_run/first_run.h"
@@ -1156,9 +1156,10 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {
DCHECK(arc::ArcServiceManager::Get());
arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(
account_id, std::move(arc_enabled_pref));
- arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
- DCHECK(arc_auth_service);
- arc_auth_service->OnPrimaryUserProfilePrepared(profile);
+ arc::ArcSessionManager* arc_session_manager =
+ arc::ArcSessionManager::Get();
+ DCHECK(arc_session_manager);
+ arc_session_manager->OnPrimaryUserProfilePrepared(profile);
}
}
@@ -1844,9 +1845,9 @@ void UserSessionManager::Shutdown() {
if (arc::ArcBridgeService::GetEnabled(
base::CommandLine::ForCurrentProcess())) {
DCHECK(arc::ArcServiceManager::Get());
- arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
- if (arc_auth_service)
- arc_auth_service->Shutdown();
+ arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get();
+ if (arc_session_manager)
+ arc_session_manager->Shutdown();
}
token_handle_fetcher_.reset();
token_handle_util_.reset();
« no previous file with comments | « chrome/browser/chromeos/login/session/chrome_session_manager.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698