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

Unified Diff: chrome/browser/ui/ash/launcher/app_shortcut_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
Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
index a21a5f4243302141518f0332ef0e9bd81d0496a9..6007c23aec06ba456049a9aa3c4036925c8a3791 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
@@ -41,12 +41,12 @@ class AppShortcutLauncherItemController : public LauncherItemController {
std::vector<content::WebContents*> GetRunningApplications();
// 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 ExecuteCommand(uint32_t command_id, int event_flags) override;
+ void ItemSelected(std::unique_ptr<ui::Event> event,
+ int64_t display_id,
+ ash::ShelfLaunchSource source,
+ const ItemSelectedCallback& callback) override;
+ MenuItemList GetAppMenuItems(int event_flags) override;
+ void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
void Close() override;
// Get the refocus url pattern, which can be used to identify this application

Powered by Google App Engine
This is Rietveld 408576698