Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/test/test_shelf_item_delegate.cc

Index: ash/common/test/test_shelf_item_delegate.cc
diff --git a/ash/common/test/test_shelf_item_delegate.cc b/ash/common/test/test_shelf_item_delegate.cc
index e257d6e2aad55e25adb5dd9cdf77c3b0e958da77..2d0faebe6600bf646577dd90691d5e40229dc7dc 100644
--- a/ash/common/test/test_shelf_item_delegate.cc
+++ b/ash/common/test/test_shelf_item_delegate.cc
@@ -5,6 +5,7 @@
 #include "ash/common/test/test_shelf_item_delegate.h"
 
 #include "ash/common/wm_window.h"
+#include "ash/wm/window_util.h"
 
 namespace ash {
 namespace test {
@@ -14,16 +15,18 @@ TestShelfItemDelegate::TestShelfItemDelegate(WmWindow* window)
 
 TestShelfItemDelegate::~TestShelfItemDelegate() {}
 
-ShelfItemDelegate::PerformedAction TestShelfItemDelegate::ItemSelected(
-    const ui::Event& event) {
+ShelfAction TestShelfItemDelegate::ItemSelected(ui::EventType event_type,
+                                                int event_flags,
+                                                int64_t display_id,
+                                                ShelfLaunchSource source) {
   if (window_) {
     if (window_->GetType() == ui::wm::WINDOW_TYPE_PANEL)
-      window_->MoveToEventRoot(event);
+      wm::MoveWindowToDisplay(window_->aura_window(), display_id);
     window_->Show();
     window_->Activate();
-    return kExistingWindowActivated;
+    return SHELF_ACTION_WINDOW_ACTIVATED;
   }
-  return kNoAction;
+  return SHELF_ACTION_NONE;
 }
 
 ShelfAppMenuItemList TestShelfItemDelegate::GetAppMenuItems(int event_flags) {