| Index: ui/ozone/demo/software_renderer.h
|
| diff --git a/ui/ozone/demo/software_renderer.h b/ui/ozone/demo/software_renderer.h
|
| index 6fbbcbec44d744d8a67928182dc47e464cb94a12..723cd95e15b79a06c2b62511752a84e3dc056971 100644
|
| --- a/ui/ozone/demo/software_renderer.h
|
| +++ b/ui/ozone/demo/software_renderer.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef UI_OZONE_DEMO_SOFTWARE_RENDERER_H_
|
| #define UI_OZONE_DEMO_SOFTWARE_RENDERER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/timer/timer.h"
|
| #include "ui/ozone/demo/renderer_base.h"
|
| @@ -33,9 +34,9 @@ class SoftwareRenderer : public RendererBase {
|
| void UpdateVSyncParameters(const base::TimeTicks timebase,
|
| const base::TimeDelta interval);
|
|
|
| - scoped_ptr<SurfaceOzoneCanvas> software_surface_;
|
| + std::unique_ptr<SurfaceOzoneCanvas> software_surface_;
|
|
|
| - scoped_ptr<gfx::VSyncProvider> vsync_provider_;
|
| + std::unique_ptr<gfx::VSyncProvider> vsync_provider_;
|
|
|
| // Timer for animation.
|
| base::RepeatingTimer timer_;
|
|
|