Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc

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 dbeb045297641e392eda5a2265b39650971a20c1..aa55e1edc3e908dae230a293085d42673ececab9 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,9 +32,12 @@ base::TimeDelta ArcAppDeferredLauncherItemController::GetActiveTime() const {
   return base::Time::Now() - start_time_;
 }
 
-ash::ShelfItemDelegate::PerformedAction
-ArcAppDeferredLauncherItemController::ItemSelected(const ui::Event& event) {
-  return ash::ShelfItemDelegate::kNoAction;
+ash::ShelfAction ArcAppDeferredLauncherItemController::ItemSelected(
+    ui::EventType event_type,
+    int event_flags,
+    int64_t display_id,
+    ash::ShelfLaunchSource source) {
+  return ash::SHELF_ACTION_NONE;
 }
 
 ash::ShelfAppMenuItemList ArcAppDeferredLauncherItemController::GetAppMenuItems(
@@ -46,8 +49,3 @@ void ArcAppDeferredLauncherItemController::Close() {
   if (host_)
     host_->Close(app_id());
 }
-
-ash::ShelfItemDelegate::PerformedAction
-ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) {
-  return ash::ShelfItemDelegate::kNoAction;
-}