chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h - Issue 2718563008: mash: Use mojo for ShelfItemDelegate and [app] MenuItem.

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_window_launcher_item_controller.h

Issue 2718563008: mash: Use mojo for ShelfItemDelegate and [app] MenuItem. (Closed)

Patch Set: Address comments. 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/app_shortcut_launcher_item_controller.cc ('K') | « chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_window_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_window_launcher_item_controller.h

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

index b83629cb6a7b2c159c6decd5b00fcb1b56369b9e..b4c7648642b2dbd28eeba6e18d327119a82dd9b6 100644

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

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

@@ -23,11 +23,12 @@ class ArcAppWindowLauncherItemController

~ArcAppWindowLauncherItemController() override;

// LauncherItemController overrides:

- ash::ShelfAction ItemSelected(ui::EventType event_type,

- int event_flags,

- int64_t display_id,

- ash::ShelfLaunchSource source) override;

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

+ void ItemSelected(std::unique_ptr<ui::Event> event,

+ int64_t display_id,

+ ash::ShelfLaunchSource source,

+ const ItemSelectedCallback& callback) override;

+ std::vector<ash::mojom::MenuItemPtr> GetAppMenuItems(

+ int event_flags) override;

void AddTaskId(int task_id);

void RemoveTaskId(int task_id);