chrome/browser/ui/ash/launcher/arc_app_deferred_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/arc_app_deferred_launcher_item_controller.h

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

Patch Set: Add comments 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 549a58c3000e224ddf540128ed82caba852b4cd6..fce450e9cbe81d41f17b3e2e6c985d4be522a5c7 100644

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

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

@@ -35,14 +35,13 @@ class ArcAppDeferredLauncherItemController : public LauncherItemController {

// ash::ShelfItemDelegate

ash::ShelfItemDelegate::PerformedAction ItemSelected(

const ui::Event& event) override;

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

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

void Close() override;

// LauncherItemController overrides:

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

ash::ShelfItemDelegate::PerformedAction Activate(

ash::LaunchSource source) override;

- ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;

private:

// The flags of the event that caused the ARC app to be activated. These will