Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2088)

Unified Diff: cc/input/top_controls_manager.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/input/scrollbar_animation_controller_thinning_unittest.cc ('k') | cc/input/top_controls_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « cc/input/scrollbar_animation_controller_thinning_unittest.cc ('k') | cc/input/top_controls_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698