| Index: ash/shelf/shelf_item_delegate_manager.cc
|
| diff --git a/ash/shelf/shelf_item_delegate_manager.cc b/ash/shelf/shelf_item_delegate_manager.cc
|
| index 5f988e23f8fb885095fe602f01cf73179166cf5d..fea8993e4ea35e85a23d8728e1de4b1c4ab194bc 100644
|
| --- a/ash/shelf/shelf_item_delegate_manager.cc
|
| +++ b/ash/shelf/shelf_item_delegate_manager.cc
|
| @@ -36,7 +36,7 @@ void ShelfItemDelegateManager::RemoveObserver(
|
|
|
| void ShelfItemDelegateManager::SetShelfItemDelegate(
|
| ShelfID id,
|
| - scoped_ptr<ShelfItemDelegate> item_delegate) {
|
| + std::unique_ptr<ShelfItemDelegate> item_delegate) {
|
| // If another ShelfItemDelegate is already registered for |id|, we assume
|
| // that this request is replacing ShelfItemDelegate for |id| with
|
| // |item_delegate|.
|
|
|