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

Unified Diff: cc/animation/animation_registrar.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/animation_player.cc ('k') | cc/animation/animation_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/animation_registrar.h
diff --git a/cc/animation/animation_registrar.h b/cc/animation/animation_registrar.h
index bc143307c346ee6264ec19bf7c3d8cb93b42cfd6..ca588f6a3ca1332f8f083407c892fb0afd6a31c7 100644
--- a/cc/animation/animation_registrar.h
+++ b/cc/animation/animation_registrar.h
@@ -5,11 +5,12 @@
#ifndef CC_ANIMATION_ANIMATION_REGISTRAR_H_
#define CC_ANIMATION_ANIMATION_REGISTRAR_H_
+#include <memory>
#include <unordered_map>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "cc/base/cc_export.h"
@@ -23,8 +24,8 @@ class CC_EXPORT AnimationRegistrar {
using AnimationControllerMap =
std::unordered_map<int, LayerAnimationController*>;
- static scoped_ptr<AnimationRegistrar> Create() {
- return make_scoped_ptr(new AnimationRegistrar());
+ static std::unique_ptr<AnimationRegistrar> Create() {
+ return base::WrapUnique(new AnimationRegistrar());
}
virtual ~AnimationRegistrar();
@@ -72,8 +73,8 @@ class CC_EXPORT AnimationRegistrar {
bool UpdateAnimationState(bool start_ready_animations,
AnimationEvents* events);
- scoped_ptr<AnimationEvents> CreateEvents();
- void SetAnimationEvents(scoped_ptr<AnimationEvents> events);
+ std::unique_ptr<AnimationEvents> CreateEvents();
+ void SetAnimationEvents(std::unique_ptr<AnimationEvents> events);
private:
AnimationRegistrar();
« no previous file with comments | « cc/animation/animation_player.cc ('k') | cc/animation/animation_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698