chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2507073002: Split ArcSessionManager from ArcAuthService.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.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

« no previous file with comments | « chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

index 3bc7f687332e6d68f1cc7fb32914085da56275b4..870186d1f7bb6f5129136f787a5ba4966a58dc2c 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

@@ -18,7 +18,7 @@

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

#include "base/bind.h"

-#include "chrome/browser/chromeos/arc/arc_auth_service.h"

+#include "chrome/browser/chromeos/arc/arc_session_manager.h"

#include "chrome/browser/chromeos/arc/arc_support_host.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"

@@ -247,7 +247,7 @@ ArcAppWindowLauncherController::ArcAppWindowLauncherController(

ChromeLauncherController* owner,

ash::ShelfDelegate* shelf_delegate)

: AppWindowLauncherController(owner), shelf_delegate_(shelf_delegate) {

- if (arc::ArcAuthService::IsAllowedForProfile(owner->profile())) {

+ if (arc::ArcSessionManager::IsAllowedForProfile(owner->profile())) {

observed_profile_ = owner->profile();

StartObserving(observed_profile_);

}

@@ -307,7 +307,7 @@ void ArcAppWindowLauncherController::ActiveUserChanged(

void ArcAppWindowLauncherController::AdditionalUserAddedToSession(

Profile* profile) {

- DCHECK(!arc::ArcAuthService::IsAllowedForProfile(profile));

+ DCHECK(!arc::ArcSessionManager::IsAllowedForProfile(profile));

}

void ArcAppWindowLauncherController::OnWindowInitialized(aura::Window* window) {