| 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..fdb2106db2803b869ab6357cf6a532ba72166290 100644
|
| --- a/ash/desktop_background/desktop_background_view.h
|
| +++ b/ash/desktop_background/desktop_background_view.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
|
| #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| #include "ui/events/event.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| @@ -32,7 +34,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);
|
| };
|
|
|