| Index: cc/layers/viewport.h
|
| diff --git a/cc/layers/viewport.h b/cc/layers/viewport.h
|
| index 0c928818ac6a0aff0e4a82bc9096054fb277c9bc..2d603f253f263241a9c06a90b334316e5036ba51 100644
|
| --- a/cc/layers/viewport.h
|
| +++ b/cc/layers/viewport.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef CC_LAYERS_VIEWPORT_H_
|
| #define CC_LAYERS_VIEWPORT_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/layers/layer_impl.h"
|
| #include "ui/gfx/geometry/vector2d_f.h"
|
|
|
| @@ -34,7 +35,7 @@ class CC_EXPORT Viewport {
|
| gfx::Vector2dF content_scrolled_delta;
|
| };
|
|
|
| - static scoped_ptr<Viewport> Create(LayerTreeHostImpl* host_impl);
|
| + static std::unique_ptr<Viewport> Create(LayerTreeHostImpl* host_impl);
|
|
|
| // Differs from scrolling in that only the visual viewport is moved, without
|
| // affecting the top controls or outer viewport.
|
|
|