| 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 a62535b2fc63baa1e1883dd263f23fa45a6381c4..d21f46f29a18c665cac4196ebee3c407b22db90a 100644
|
| --- a/ash/shell/window_watcher_shelf_item_delegate.cc
|
| +++ b/ash/shell/window_watcher_shelf_item_delegate.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ash/shell/window_watcher_shelf_item_delegate.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "ash/shell/window_watcher.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ui/aura/window.h"
|
| @@ -25,13 +27,13 @@ void WindowWatcherShelfItemDelegate::ItemSelected(
|
| std::unique_ptr<ui::Event> event,
|
| int64_t display_id,
|
| ShelfLaunchSource source,
|
| - const ItemSelectedCallback& callback) {
|
| + ItemSelectedCallback callback) {
|
| aura::Window* window = watcher_->GetWindowByID(shelf_id());
|
| if (window->type() == ui::wm::WINDOW_TYPE_PANEL)
|
| wm::MoveWindowToDisplay(window, display_id);
|
| window->Show();
|
| wm::ActivateWindow(window);
|
| - callback.Run(SHELF_ACTION_WINDOW_ACTIVATED, base::nullopt);
|
| + std::move(callback).Run(SHELF_ACTION_WINDOW_ACTIVATED, base::nullopt);
|
| }
|
|
|
| void WindowWatcherShelfItemDelegate::ExecuteCommand(uint32_t command_id,
|
|
|