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

Unified Diff: cc/animation/layer_animation_controller.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/animation/keyframed_animation_curve_unittest.cc ('k') | cc/animation/layer_animation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/layer_animation_controller.h
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
index 2676d812f135b7d7fe81b73f85a05e9b435037b8..4a7b1873e73c3b179f805c6a9552af0791aee3f1 100644
--- a/cc/animation/layer_animation_controller.h
+++ b/cc/animation/layer_animation_controller.h
@@ -6,11 +6,11 @@
#define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
#include <bitset>
+#include <memory>
#include <vector>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/time/time.h"
#include "cc/animation/animation.h"
@@ -44,7 +44,7 @@ class CC_EXPORT LayerAnimationController
int id() const { return id_; }
- void AddAnimation(scoped_ptr<Animation> animation);
+ void AddAnimation(std::unique_ptr<Animation> animation);
void PauseAnimation(int animation_id, base::TimeDelta time_offset);
void RemoveAnimation(int animation_id);
void AbortAnimation(int animation_id);
@@ -228,7 +228,7 @@ class CC_EXPORT LayerAnimationController
AnimationRegistrar* registrar_;
int id_;
- std::vector<scoped_ptr<Animation>> animations_;
+ std::vector<std::unique_ptr<Animation>> animations_;
// This is used to ensure that we don't spam the registrar.
bool is_active_;
« no previous file with comments | « cc/animation/keyframed_animation_curve_unittest.cc ('k') | cc/animation/layer_animation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698