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

Unified Diff: cc/animation/animation_registrar.cc

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_registrar.h ('k') | cc/animation/animation_timeline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/animation_registrar.cc
diff --git a/cc/animation/animation_registrar.cc b/cc/animation/animation_registrar.cc
index e498045b56d4d2f3485f5a4b95ee63e93978d0fa..7380218a981d61e229606a27cd33a8f3e8429706 100644
--- a/cc/animation/animation_registrar.cc
+++ b/cc/animation/animation_registrar.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include "base/memory/ptr_util.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/trace_event_argument.h"
#include "cc/animation/animation_events.h"
@@ -99,12 +100,12 @@ bool AnimationRegistrar::UpdateAnimationState(bool start_ready_animations,
return true;
}
-scoped_ptr<AnimationEvents> AnimationRegistrar::CreateEvents() {
- return make_scoped_ptr(new AnimationEvents());
+std::unique_ptr<AnimationEvents> AnimationRegistrar::CreateEvents() {
+ return base::WrapUnique(new AnimationEvents());
}
void AnimationRegistrar::SetAnimationEvents(
- scoped_ptr<AnimationEvents> events) {
+ std::unique_ptr<AnimationEvents> events) {
for (size_t event_index = 0; event_index < events->events_.size();
++event_index) {
int event_layer_id = events->events_[event_index].layer_id;
« no previous file with comments | « cc/animation/animation_registrar.h ('k') | cc/animation/animation_timeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698