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

« no previous file with comments | « ui/views/animation/ink_drop_animation_controller.h ('k') | ui/views/animation/ink_drop_animation_controller_factory.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.h

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

index 839631460f713440026dc5012f2d08d6bb891526..dd883598edeb6e624d7fc8feb01b8d5c905719b6 100644

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

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

@@ -5,8 +5,9 @@

#ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_FACTORY_H_

#define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_FACTORY_H_

+#include <memory>

#include "base/macros.h"

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

#include "ui/views/views_export.h"

namespace views {

@@ -21,7 +22,7 @@ class VIEWS_EXPORT InkDropAnimationControllerFactory {

// Creates a new InkDropAnimationController that will add/remove an

// InkDropAnimation's ui::Layer to/from the |ink_drop_host| when the animation

// is active/inactive.

- static scoped_ptr<InkDropAnimationController>

+ static std::unique_ptr<InkDropAnimationController>

CreateInkDropAnimationController(InkDropHost* ink_drop_host);

private:

« no previous file with comments | « ui/views/animation/ink_drop_animation_controller.h ('k') | ui/views/animation/ink_drop_animation_controller_factory.cc » ('j') | no next file with comments »