Index: cc/input/top_controls_manager.h |
diff --git a/cc/input/top_controls_manager.h b/cc/input/top_controls_manager.h |
index 995577db01b81a912cbc0ca93a21b9cc71c06f8b..69bb75dc704233dc4d12050e1f22a5161bad5e34 100644 |
--- a/cc/input/top_controls_manager.h |
+++ b/cc/input/top_controls_manager.h |
@@ -5,8 +5,9 @@ |
#ifndef CC_INPUT_TOP_CONTROLS_MANAGER_H_ |
#define CC_INPUT_TOP_CONTROLS_MANAGER_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "cc/input/top_controls_state.h" |
#include "cc/layers/layer_impl.h" |
@@ -33,7 +34,7 @@ class CC_EXPORT TopControlsManager |
HIDING_CONTROLS |
}; |
- static scoped_ptr<TopControlsManager> Create( |
+ static std::unique_ptr<TopControlsManager> Create( |
TopControlsManagerClient* client, |
float top_controls_show_threshold, |
float top_controls_hide_threshold); |
@@ -79,7 +80,7 @@ class CC_EXPORT TopControlsManager |
TopControlsManagerClient* client_; // The client manages the lifecycle of |
// this. |
- scoped_ptr<KeyframedFloatAnimationCurve> top_controls_animation_; |
+ std::unique_ptr<KeyframedFloatAnimationCurve> top_controls_animation_; |
AnimationDirection animation_direction_; |
TopControlsState permitted_state_; |