chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc - Issue 2791803002: mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

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 2791803002: mash: Move LauncherItemController to ash, rename ShelfItemDelegate. (Closed)

Patch Set: Move shelf_item_delegate to ash/public/cpp, cleanup. Created 3 years, 8 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/launcher/app_shortcut_launcher_item_controller.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.h » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('J')
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 cca497dd350c0ff9d0e7b7e2a1dbb33044ac6d41..54181a30f61a81658e10fb2c55c9b7b7a4f6f9cb 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

@@ -203,8 +203,8 @@ void ArcAppDeferredLauncherController::RegisterDeferredLaunch(

return;

ArcAppDeferredLauncherItemController* controller =

- new ArcAppDeferredLauncherItemController(

- shelf_app_id, owner_, event_flags, weak_ptr_factory_.GetWeakPtr());

+ new ArcAppDeferredLauncherItemController(shelf_app_id, event_flags,

+ weak_ptr_factory_.GetWeakPtr());

if (shelf_id == 0) {

owner_->CreateAppLauncherItem(controller, ash::STATUS_RUNNING);

} else {