Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/shelf/app_list_shelf_item_delegate.cc

 // Copyright 2013 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 "ash/common/shelf/app_list_shelf_item_delegate.h"
 
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm_shell.h"
 #include "base/memory/ptr_util.h"
 #include "grit/ash_strings.h"
@@ skipping 14 matching lines @@
   // Create an AppListShelfItemDelegate for that item.
   ShelfID id = model->items()[index].id;
   DCHECK_GE(id, 0);
   model->SetShelfItemDelegate(id, base::MakeUnique<AppListShelfItemDelegate>());
 }
 
 AppListShelfItemDelegate::AppListShelfItemDelegate() {}
 
 AppListShelfItemDelegate::~AppListShelfItemDelegate() {}
 
-ShelfItemDelegate::PerformedAction AppListShelfItemDelegate::ItemSelected(
-    const ui::Event& event) {
+ShelfAction AppListShelfItemDelegate::ItemSelected(ui::EventType event_type,
+                                                   int event_flags,
+                                                   int64_t display_id,
+                                                   ShelfLaunchSource source) {
   WmShell::Get()->ToggleAppList();
-  return ShelfItemDelegate::kAppListMenuShown;
+  return SHELF_ACTION_APP_LIST_SHOWN;
 }
 
 ShelfAppMenuItemList AppListShelfItemDelegate::GetAppMenuItems(
     int event_flags) {
   // AppList does not show an application menu.
   return ShelfAppMenuItemList();
 }
 
 void AppListShelfItemDelegate::Close() {}
 
 }  // namespace ash