ui/compositor/float_animation_curve_adapter.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/compositor/float_animation_curve_adapter.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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

Index: ui/compositor/float_animation_curve_adapter.h

diff --git a/ui/compositor/float_animation_curve_adapter.h b/ui/compositor/float_animation_curve_adapter.h

index 7657c8a5d08bb0833ba19aac97b05a5e2d7e8b6f..b63370617486842fc5d2eae404be2a0a1c911d0d 100644

--- a/ui/compositor/float_animation_curve_adapter.h

+++ b/ui/compositor/float_animation_curve_adapter.h

@@ -5,7 +5,8 @@

#ifndef UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_

#define UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_

-#include "base/memory/scoped_ptr.h"

+#include <memory>

#include "base/time/time.h"

#include "cc/animation/animation_curve.h"

#include "ui/gfx/animation/tween.h"

@@ -23,7 +24,7 @@ class FloatAnimationCurveAdapter : public cc::FloatAnimationCurve {

// FloatAnimationCurve implementation.

base::TimeDelta Duration() const override;

- scoped_ptr<cc::AnimationCurve> Clone() const override;

+ std::unique_ptr<cc::AnimationCurve> Clone() const override;

float GetValue(base::TimeDelta t) const override;

private:

« no previous file with comments | « ui/compositor/compositor_unittest.cc ('k') | ui/compositor/float_animation_curve_adapter.cc » ('j') | no next file with comments »