| Index: ash/desktop_background/desktop_background_view.h
|
| diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h
|
| index a12a68fc5a36b3b77c1f24173b827a2c2cc065f9..5ba367106a43d42dd9da5ad8d9e3c75c87ce27c0 100644
|
| --- a/ash/desktop_background/desktop_background_view.h
|
| +++ b/ash/desktop_background/desktop_background_view.h
|
| @@ -32,7 +32,7 @@ class DesktopBackgroundView : public views::View,
|
| void ShowContextMenuForView(views::View* source,
|
| const gfx::Point& point,
|
| ui::MenuSourceType source_type) override;
|
| - scoped_ptr<PreEventDispatchHandler> pre_dispatch_handler_;
|
| + std::unique_ptr<PreEventDispatchHandler> pre_dispatch_handler_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView);
|
| };
|
|
|