Index: ash/shell/window_watcher_shelf_item_delegate.cc |
diff --git a/ash/shell/window_watcher_shelf_item_delegate.cc b/ash/shell/window_watcher_shelf_item_delegate.cc |
index 935186d56a7dd45ab0da9557192eca83384b2f54..99d69ec757dbd5b5b82862be2c1816379509ac6c 100644 |
--- a/ash/shell/window_watcher_shelf_item_delegate.cc |
+++ b/ash/shell/window_watcher_shelf_item_delegate.cc |
@@ -21,14 +21,17 @@ WindowWatcherShelfItemDelegate::WindowWatcherShelfItemDelegate( |
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( |