Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

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

 // 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.
 
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 14 matching lines @@
 
 ArcAppDeferredLauncherItemController::~ArcAppDeferredLauncherItemController() {
   if (host_)
     host_->Remove(app_id());
 }
 
 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(
     int event_flags) {
   return ash::ShelfAppMenuItemList();
 }
 
 void ArcAppDeferredLauncherItemController::Close() {
   if (host_)
     host_->Close(app_id());
 }
-
-ash::ShelfItemDelegate::PerformedAction
-ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) {
-  return ash::ShelfItemDelegate::kNoAction;
-}