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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_deferred_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_app_deferred_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
index 47ab491f4db2650de393cc1ba5545d8d10aab945..71beac11cab589e9a2d8f7d312202c230fb12628 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
@@ -32,22 +32,16 @@ base::TimeDelta ArcAppDeferredLauncherItemController::GetActiveTime() const {
return base::Time::Now() - start_time_;
}
-ash::ShelfAction ArcAppDeferredLauncherItemController::ItemSelected(
- ui::EventType event_type,
- int event_flags,
+void ArcAppDeferredLauncherItemController::ItemSelected(
+ std::unique_ptr<ui::Event> event,
int64_t display_id,
- ash::ShelfLaunchSource source) {
- return ash::SHELF_ACTION_NONE;
-}
-
-ash::ShelfAppMenuItemList ArcAppDeferredLauncherItemController::GetAppMenuItems(
- int event_flags) {
- // Return an empty item list to avoid showing an application menu.
- return ash::ShelfAppMenuItemList();
+ ash::ShelfLaunchSource source,
+ const ItemSelectedCallback& callback) {
+ callback.Run(ash::SHELF_ACTION_NONE, base::nullopt);
}
void ArcAppDeferredLauncherItemController::ExecuteCommand(uint32_t command_id,
- int event_flags) {
+ int32_t event_flags) {
// This delegate does not support showing an application menu.
NOTIMPLEMENTED();
}

Powered by Google App Engine
This is Rietveld 408576698