Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/shelf/app_list_shelf_item_delegate.h

Index: ash/common/shelf/app_list_shelf_item_delegate.h
diff --git a/ash/common/shelf/app_list_shelf_item_delegate.h b/ash/common/shelf/app_list_shelf_item_delegate.h
index 775d3be4d6c6b2886547fca9d05d8b0bf9abaa90..a7d56ff6f71a7b9db7c7f3e808e3e7ede7d37dbb 100644
--- a/ash/common/shelf/app_list_shelf_item_delegate.h
+++ b/ash/common/shelf/app_list_shelf_item_delegate.h
@@ -22,8 +22,10 @@ class AppListShelfItemDelegate : public ShelfItemDelegate {
   ~AppListShelfItemDelegate() 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;