Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1993)

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
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));
}

Powered by Google App Engine
This is Rietveld 408576698