| Index: ash/shell/window_watcher.cc
|
| diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
|
| index bd5d148516d33b5ce2fa05a905694f543565f822..e8163b257f59004f0e65a014af01f5b75f499662 100644
|
| --- a/ash/shell/window_watcher.cc
|
| +++ b/ash/shell/window_watcher.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ash/shell/window_watcher.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "ash/display/window_tree_host_manager.h"
|
| #include "ash/shelf/shelf.h"
|
| #include "ash/shelf/shelf_item_delegate_manager.h"
|
| @@ -118,7 +120,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
|
| Shell::GetInstance()->shelf_item_delegate_manager();
|
| scoped_ptr<ShelfItemDelegate> delegate(
|
| new WindowWatcherShelfItemDelegate(id, this));
|
| - manager->SetShelfItemDelegate(id, delegate.Pass());
|
| + manager->SetShelfItemDelegate(id, std::move(delegate));
|
| SetShelfIDForWindow(id, new_window);
|
| }
|
|
|
|
|