ui/views/animation/flood_fill_ink_drop_animation.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ui/views/animation/flood_fill_ink_drop_animation.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 unified diff | Download patch

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

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_ANIMATION_H_	5 #ifndef UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_ANIMATION_H_

6 #define UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_ANIMATION_H_	6 #define UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_ANIMATION_H_

7	7

	8 #include <memory>

8 #include <string>	9 #include <string>

9	10

10 #include "base/macros.h"	11 #include "base/macros.h"

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

12 #include "base/time/time.h"	12 #include "base/time/time.h"

13 #include "third_party/skia/include/core/SkColor.h"	13 #include "third_party/skia/include/core/SkColor.h"

14 #include "ui/compositor/layer.h"	14 #include "ui/compositor/layer.h"

15 #include "ui/compositor/layer_animator.h"	15 #include "ui/compositor/layer_animator.h"

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

17 #include "ui/gfx/geometry/point.h"	17 #include "ui/gfx/geometry/point.h"

18 #include "ui/gfx/geometry/size.h"	18 #include "ui/gfx/geometry/size.h"

19 #include "ui/gfx/transform.h"	19 #include "ui/gfx/transform.h"

20 #include "ui/views/animation/ink_drop_animation.h"	20 #include "ui/views/animation/ink_drop_animation.h"

21 #include "ui/views/animation/ink_drop_painted_layer_delegates.h"	21 #include "ui/views/animation/ink_drop_painted_layer_delegates.h"

(...skipping 99 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
121	121

122 // The current ink drop state.	122 // The current ink drop state.

123 InkDropState ink_drop_state_;	123 InkDropState ink_drop_state_;

124	124

125 DISALLOW_COPY_AND_ASSIGN(FloodFillInkDropAnimation);	125 DISALLOW_COPY_AND_ASSIGN(FloodFillInkDropAnimation);

126 };	126 };

127	127

128 } // namespace views	128 } // namespace views

129	129

130 #endif // UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_ANIMATION_H_	130 #endif // UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_ANIMATION_H_

OLD	NEW