| Index: ash/shelf/shelf_window_watcher.cc
|
| diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc
|
| index 4bdb024e3eeedfead2ce1c1f8cf069aa96f1ae29..4146b50952554cd8c746eb7090f3d9f46e4dd469 100644
|
| --- a/ash/shelf/shelf_window_watcher.cc
|
| +++ b/ash/shelf/shelf_window_watcher.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ash/shelf/shelf_window_watcher.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "ash/display/window_tree_host_manager.h"
|
| #include "ash/shelf/shelf_constants.h"
|
| #include "ash/shelf/shelf_item_delegate_manager.h"
|
| @@ -136,7 +138,7 @@ void ShelfWindowWatcher::AddShelfItem(aura::Window* window) {
|
| scoped_ptr<ShelfItemDelegate> item_delegate(
|
| new ShelfWindowWatcherItemDelegate(window, model_));
|
| // |item_delegate| is owned by |item_delegate_manager_|.
|
| - item_delegate_manager_->SetShelfItemDelegate(id, item_delegate.Pass());
|
| + item_delegate_manager_->SetShelfItemDelegate(id, std::move(item_delegate));
|
| model_->Add(item);
|
| }
|
|
|
|
|