ash/common/shelf/shelf_window_watcher_item_delegate.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: ash/common/shelf/shelf_window_watcher_item_delegate.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:

Index: ash/common/shelf/shelf_window_watcher_item_delegate.h

diff --git a/ash/common/shelf/shelf_window_watcher_item_delegate.h b/ash/common/shelf/shelf_window_watcher_item_delegate.h

index 592ba73516afb1eeb492b97ee7a5e6c859b4a48e..f0a8c29d802588c2aed643bd636cd57ff2531494 100644

--- a/ash/common/shelf/shelf_window_watcher_item_delegate.h

+++ b/ash/common/shelf/shelf_window_watcher_item_delegate.h

@@ -23,7 +23,7 @@ class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {

// ShelfItemDelegate overrides:

ShelfItemDelegate::PerformedAction ItemSelected(

const ui::Event& event) override;

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

+ ShelfApplicationMenuItems GetAppMenuItems(int event_flags) override;

void Close() override;

ShelfID id_;