Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/shell/window_watcher_shelf_item_delegate.h

Index: ash/shell/window_watcher_shelf_item_delegate.h
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
index b867231e5fa85bb6ba12162850a9f1a982e6178f..8e638938f43dbf0e50341a3bff4d2986388e50fe 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -22,8 +22,10 @@ class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
   ~WindowWatcherShelfItemDelegate() override;
 
   // ShelfItemDelegate:
-  ShelfItemDelegate::PerformedAction ItemSelected(
-      const ui::Event& event) override;
+  ShelfAction ItemSelected(ui::EventType event_type,
+                           int event_flags,
+                           int64_t display_id,
+                           ShelfLaunchSource source) override;
   ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
   void Close() override;