chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc - Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash.

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_deferred_launcher_controller.cc

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)

Patch Set: Address most comments, except manifest, need to sync. 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

« chrome/browser/ui/ash/chrome_shell_delegate.cc ('K') | « chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_deferred_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_deferred_launcher_controller.cc

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

index 4f8152ff810fc77581f9e15d921e374675891223..a37d44cb1f3b0badd0b82f7ad7d573205b2d6a8d 100644

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

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

@@ -59,8 +59,8 @@ class SpinningEffectSource : public gfx::CanvasImageSource {

ArcAppDeferredLauncherController::ArcAppDeferredLauncherController(

ChromeLauncherControllerImpl* owner)

: owner_(owner), weak_ptr_factory_(this) {

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

- observed_profile_ = owner->GetProfile();

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

+ observed_profile_ = owner->profile();

ArcAppListPrefs::Get(observed_profile_)->AddObserver(this);

}

arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();

@@ -114,7 +114,7 @@ void ArcAppDeferredLauncherController::Close(const std::string& app_id) {

app_controller_map_.erase(it);

if (need_close_item)

owner_->CloseLauncherItem(shelf_id);

- owner_->OnAppUpdated(owner_->GetProfile(), shelf_app_id);

+ owner_->OnAppUpdated(owner_->profile(), shelf_app_id);

}

void ArcAppDeferredLauncherController::OnAppReadyChanged(

@@ -168,7 +168,7 @@ void ArcAppDeferredLauncherController::UpdateApps() {

RegisterNextUpdate();

for (const auto pair : app_controller_map_)

- owner_->OnAppUpdated(owner_->GetProfile(), pair.first);

+ owner_->OnAppUpdated(owner_->profile(), pair.first);

}

void ArcAppDeferredLauncherController::RegisterNextUpdate() {