chrome/browser/ui/ash/launcher/launcher_context_menu.cc - Issue 2835063003: mash: Use ChromeLauncherControllerImpl, remove Mus subclass stub.

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/launcher_context_menu.cc

Issue 2835063003: mash: Use ChromeLauncherControllerImpl, remove Mus subclass stub. (Closed)

Patch Set: Add comment and separate mash-only members. 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:

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

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

index 337b3c8ea453b423f7f15b3636798f8eb8a604a0..56633d0dfd1b9c43e1427fa953e0f53e1bd40462 100644

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

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

@@ -116,7 +116,7 @@ void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) {

case MENU_CLOSE:

if (item_.type == ash::TYPE_DIALOG) {

ash::ShelfItemDelegate* item_delegate =

- ash::Shell::Get()->shelf_model()->GetShelfItemDelegate(item_.id);

+ controller_->shelf_model()->GetShelfItemDelegate(item_.id);

DCHECK(item_delegate);

item_delegate->Close();

} else {