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

Unified Diff: chrome/browser/ui/app_list/app_list_syncable_service.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/ui/app_list/app_list_syncable_service.cc
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc
index 2972882914d8d62f858e6b10bbdcfdc9d9a67d4e..555bfbd8b4e574a0268217e7dd5f6b4401a67d69 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc
@@ -40,7 +40,7 @@
#include "ui/base/l10n/l10n_util.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/file_manager/app_id.h"
#include "chrome/browser/chromeos/genius_app/app_id.h"
#include "chrome/browser/ui/app_list/arc/arc_app_item.h"
@@ -261,9 +261,10 @@ class AppListSyncableService::ModelObserver : public AppListModelObserver {
#if defined(OS_CHROMEOS)
if (item->GetItemType() == ArcAppItem::kItemType) {
// Don't sync remove changes coming as result of disabling Arc.
- const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
- DCHECK(auth_service);
- if (!auth_service->IsArcEnabled())
+ const arc::ArcSessionManager* arc_session_manager =
+ arc::ArcSessionManager::Get();
+ DCHECK(arc_session_manager);
+ if (!arc_session_manager->IsArcEnabled())
return;
}
#endif
@@ -394,7 +395,7 @@ void AppListSyncableService::BuildModel() {
controller = service->GetControllerDelegate();
apps_builder_.reset(new ExtensionAppModelBuilder(controller));
#if defined(OS_CHROMEOS)
- if (arc::ArcAuthService::IsAllowedForProfile(profile_))
+ if (arc::ArcSessionManager::IsAllowedForProfile(profile_))
arc_apps_builder_.reset(new ArcAppModelBuilder(controller));
#endif
DCHECK(profile_);
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_views_browsertest.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_list_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698