Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

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

 // Copyright 2014 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/app_window_launcher_item_controller.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 51 matching lines @@
     return *iter;
   return nullptr;
 }
 
 void AppWindowLauncherItemController::SetActiveWindow(aura::Window* window) {
   ui::BaseWindow* app_window = GetAppWindow(window);
   if (app_window)
     last_active_window_ = app_window;
 }
 
-ash::ShelfItemDelegate::PerformedAction
-AppWindowLauncherItemController::Activate(ash::LaunchSource source) {
-  DCHECK(!windows_.empty());
-  ui::BaseWindow* window_to_activate =
-      last_active_window_ ? last_active_window_ : windows_.back();
-  window_to_activate->Activate();
-  return kExistingWindowActivated;
-}
-
 AppWindowLauncherItemController*
 AppWindowLauncherItemController::AsAppWindowLauncherItemController() {
   return this;
 }
 
-ash::ShelfItemDelegate::PerformedAction
-AppWindowLauncherItemController::ItemSelected(const ui::Event& event) {
+ash::ShelfAction AppWindowLauncherItemController::ItemSelected(
+    ui::EventType event_type,
+    int event_flags,
+    int64_t display_id,
+    ash::ShelfLaunchSource source) {
   if (windows_.empty())
-    return kNoAction;
+    return ash::SHELF_ACTION_NONE;
 
   ui::BaseWindow* window_to_show =
       last_active_window_ ? last_active_window_ : windows_.front();
   // If the event was triggered by a keystroke, we try to advance to the next
   // item if the window we are trying to activate is already active.
   if (windows_.size() >= 1 && window_to_show->IsActive() &&
-      event.type() == ui::ET_KEY_RELEASED) {
+      event_type == ui::ET_KEY_RELEASED) {
     return ActivateOrAdvanceToNextAppWindow(window_to_show);
   }
 
   return ShowAndActivateOrMinimize(window_to_show);
 }
 
 ash::ShelfAppMenuItemList AppWindowLauncherItemController::GetAppMenuItems(
     int event_flags) {
   return ash::ShelfAppMenuItemList();
 }
@@ skipping 23 matching lines @@
       status = ash::STATUS_ACTIVE;
     } else if (window->GetProperty(aura::client::kDrawAttentionKey)) {
       status = ash::STATUS_ATTENTION;
     } else {
       status = ash::STATUS_RUNNING;
     }
     launcher_controller()->SetItemStatus(shelf_id(), status);
   }
 }
 
-ash::ShelfItemDelegate::PerformedAction
-AppWindowLauncherItemController::ShowAndActivateOrMinimize(
+ash::ShelfAction AppWindowLauncherItemController::ShowAndActivateOrMinimize(
     ui::BaseWindow* app_window) {
   // Either show or minimize windows when shown from the launcher.
   return launcher_controller()->ActivateWindowOrMinimizeIfActive(
       app_window, GetAppMenuItems(0).size() == 1);
 }
 
-ash::ShelfItemDelegate::PerformedAction
+ash::ShelfAction
 AppWindowLauncherItemController::ActivateOrAdvanceToNextAppWindow(
     ui::BaseWindow* window_to_show) {
   WindowList::iterator i(
       std::find(windows_.begin(), windows_.end(), window_to_show));
   if (i != windows_.end()) {
     if (++i != windows_.end())
       window_to_show = *i;
     else
       window_to_show = windows_.front();
   }
   if (window_to_show->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   wm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     return ShowAndActivateOrMinimize(window_to_show);
   }
-  return kNoAction;
+  return ash::SHELF_ACTION_NONE;
 }