ui/views/animation/ink_drop_animation_controller_factory.cc - 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/views/animation/ink_drop_animation_controller_factory.cc

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

« no previous file with comments | « ui/views/animation/ink_drop_animation_controller_factory.h ('k') | ui/views/animation/ink_drop_animation_controller_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/animation/ink_drop_animation_controller_factory.cc

diff --git a/ui/views/animation/ink_drop_animation_controller_factory.cc b/ui/views/animation/ink_drop_animation_controller_factory.cc

index 19bae013b571ec2255fc21fc7ceeb49019401c3b..17bc202a48343f7b4a3b85c342a82539d009c208 100644

--- a/ui/views/animation/ink_drop_animation_controller_factory.cc

+++ b/ui/views/animation/ink_drop_animation_controller_factory.cc

@@ -59,15 +59,15 @@ InkDropAnimationControllerFactory::InkDropAnimationControllerFactory() {}

InkDropAnimationControllerFactory::~InkDropAnimationControllerFactory() {}

-scoped_ptr<InkDropAnimationController>

+std::unique_ptr<InkDropAnimationController>

InkDropAnimationControllerFactory::CreateInkDropAnimationController(

InkDropHost* ink_drop_host) {

if (ui::MaterialDesignController::IsModeMaterial()) {

- return scoped_ptr<InkDropAnimationController>(

+ return std::unique_ptr<InkDropAnimationController>(

new InkDropAnimationControllerImpl(ink_drop_host));

}

- return scoped_ptr<InkDropAnimationController>(

+ return std::unique_ptr<InkDropAnimationController>(

new InkDropAnimationControllerStub());

}