chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h - Issue 2671923002: mash: Cleanup ash shelf application menu code.

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/app_shortcut_launcher_item_controller.h

Issue 2671923002: mash: Cleanup ash shelf application menu code. (Closed)

Patch Set: Fix tests; cleanup. Created 3 years, 10 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

« ash/shell/window_watcher_shelf_item_delegate.cc ('K') | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

index 9f2de66f58a6e3f0fa9b8e0e11225b5c341f0a6c..7dafe6f04d0a6b89ab74400aed6fb5ca944ffde5 100644

--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

@@ -44,10 +44,9 @@ class AppShortcutLauncherItemController : public LauncherItemController {

void Launch(ash::LaunchSource source, int event_flags) override;

ash::ShelfItemDelegate::PerformedAction Activate(

ash::LaunchSource source) override;

- ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;

ash::ShelfItemDelegate::PerformedAction ItemSelected(

const ui::Event& event) override;

- ui::SimpleMenuModel* CreateApplicationMenu(int event_flags) override;

+ ash::ShelfApplicationMenuItems GetAppMenuItems(int event_flags) override;

void Close() override;

// Get the refocus url pattern, which can be used to identify this application