chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc - 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_playstore_shortcut_launcher_item_controller.cc

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

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

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

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

index bd14a6c459aec3c2bd47ab57c53fa1a427643028..0ab7bdcc27b10dae8a44e04fc8a35f531115e798 100644

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

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

@@ -23,11 +23,11 @@ ArcPlaystoreShortcutLauncherItemController::

ArcPlaystoreShortcutLauncherItemController::

~ArcPlaystoreShortcutLauncherItemController() {}

-ash::ShelfAction ArcPlaystoreShortcutLauncherItemController::ItemSelected(

- ui::EventType event_type,

- int event_flags,

+void ArcPlaystoreShortcutLauncherItemController::ItemSelected(

+ std::unique_ptr<ui::Event> event,

int64_t display_id,

- ash::ShelfLaunchSource source) {

+ ash::ShelfLaunchSource source,

+ const ItemSelectedCallback& callback) {

Profile* profile = controller()->profile();

ArcAppListPrefs* arc_app_prefs = ArcAppListPrefs::Get(profile);

DCHECK(arc_app_prefs);

@@ -47,5 +47,6 @@ ash::ShelfAction ArcPlaystoreShortcutLauncherItemController::ItemSelected(

base::MakeUnique<ArcAppLauncher>(profile, arc::kPlayStoreAppId, true);

}

- return ash::SHELF_ACTION_NONE;

+ callback.Run(ash::SHELF_ACTION_NONE,

+ GetAppMenuItems(event ? event->flags() : ui::EF_NONE));

}