Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <string>
 #include <unordered_set>
 
 #include "base/macros.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
 
 class ChromeLauncherController;
 
 class ArcAppWindowLauncherItemController
     : public AppWindowLauncherItemController {
  public:
   ArcAppWindowLauncherItemController(const std::string& arc_app_id,
                                      ChromeLauncherController* controller);
 
   ~ArcAppWindowLauncherItemController() override;
 
   // LauncherItemController overrides:
-  ash::ShelfItemDelegate::PerformedAction ItemSelected(
-      const ui::Event& event) override;
+  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 AddTaskId(int task_id);
   void RemoveTaskId(int task_id);
   bool HasAnyTasks() const;
 
  private:
   std::unordered_set<int> task_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAppWindowLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_