Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/shell/window_watcher_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/shell/window_watcher_shelf_item_delegate.h"
 
 #include "ash/shell/window_watcher.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace shell {
 
 WindowWatcherShelfItemDelegate::WindowWatcherShelfItemDelegate(
     ShelfID id,
     WindowWatcher* watcher)
     : id_(id), watcher_(watcher) {
   DCHECK_GT(id_, 0);
   DCHECK(watcher_);
 }
 
 WindowWatcherShelfItemDelegate::~WindowWatcherShelfItemDelegate() {}
 
-ShelfItemDelegate::PerformedAction WindowWatcherShelfItemDelegate::ItemSelected(
-    const ui::Event& event) {
+ShelfAction WindowWatcherShelfItemDelegate::ItemSelected(
+    ui::EventType event_type,
+    int event_flags,
+    int64_t display_id,
+    ShelfLaunchSource source) {
   aura::Window* window = watcher_->GetWindowByID(id_);
   if (window->type() == ui::wm::WINDOW_TYPE_PANEL)
-    wm::MoveWindowToEventRoot(window, event);
+    wm::MoveWindowToDisplay(window, display_id);
   window->Show();
   wm::ActivateWindow(window);
-  return kExistingWindowActivated;
+  return SHELF_ACTION_WINDOW_ACTIVATED;
 }
 
 ShelfAppMenuItemList WindowWatcherShelfItemDelegate::GetAppMenuItems(
     int event_flags) {
   // Return an empty item list to avoid showing an application menu.
   return ShelfAppMenuItemList();
 }
 
 void WindowWatcherShelfItemDelegate::Close() {}
 
 }  // namespace shell
 }  // namespace ash