chrome/browser/ui/ash/launcher/extension_app_window_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/extension_app_window_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, 9 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/chrome_launcher_controller_impl_unittest.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc ('k') | chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7aac24658ca3f8ecb754ffcd266be4b732b7afdd..a4dee06dd48ca8a8df84d1f1730f3a8da515a3da 100644

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

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

@@ -168,7 +168,7 @@ void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {

std::string launch_id = GetLaunchId(app_window);

ExtensionAppWindowLauncherItemController* controller =

new ExtensionAppWindowLauncherItemController(

- ash::AppLaunchId(app_id, launch_id), owner());

+ ash::AppLaunchId(app_id, launch_id));

controller->AddAppWindow(app_window);

// If there is already a shelf id mapped to this AppLaunchId (e.g. pinned),

// use that shelf item.