| Index: ash/shelf/shelf_widget.h
|
| diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
|
| index ddaa2bc5a653b78afab34f9fe83a16aab4da288e..04082e6e6affac39e3c8cbcca75b5bde03734974 100644
|
| --- a/ash/shelf/shelf_widget.h
|
| +++ b/ash/shelf/shelf_widget.h
|
| @@ -100,7 +100,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
|
| class DelegateView;
|
|
|
| ShelfLayoutManager* shelf_layout_manager_;
|
| - scoped_ptr<Shelf> shelf_;
|
| + std::unique_ptr<Shelf> shelf_;
|
| StatusAreaWidget* status_area_widget_;
|
|
|
| // delegate_view_ is attached to window_container_ and is cleaned up
|
|
|