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

Unified Diff: ui/views/animation/ink_drop_host_view.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_host_view.h ('k') | ui/views/animation/ink_drop_hover.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_host_view.cc
diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
index ab55881611f0a8bf65904f434f487d3fbfc29203..1070f031d2156ecc6666a8961209e5c770fdd79d 100644
--- a/ui/views/animation/ink_drop_host_view.cc
+++ b/ui/views/animation/ink_drop_host_view.cc
@@ -34,18 +34,19 @@ void InkDropHostView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
SetPaintToLayer(false);
}
-scoped_ptr<InkDropAnimation> InkDropHostView::CreateInkDropAnimation() const {
+std::unique_ptr<InkDropAnimation> InkDropHostView::CreateInkDropAnimation()
+ const {
gfx::Size large_drop(ink_drop_size_.width() * 4 / 3,
ink_drop_size_.height() * 4 / 3);
- scoped_ptr<InkDropAnimation> animation(new SquareInkDropAnimation(
+ std::unique_ptr<InkDropAnimation> animation(new SquareInkDropAnimation(
large_drop, kInkDropLargeCornerRadius, ink_drop_size_,
kInkDropSmallCornerRadius, GetInkDropCenter(), GetInkDropBaseColor()));
return animation;
}
-scoped_ptr<InkDropHover> InkDropHostView::CreateInkDropHover() const {
- scoped_ptr<InkDropHover> hover(
+std::unique_ptr<InkDropHover> InkDropHostView::CreateInkDropHover() const {
+ std::unique_ptr<InkDropHover> hover(
new InkDropHover(ink_drop_size_, kInkDropSmallCornerRadius,
GetInkDropCenter(), GetInkDropBaseColor()));
return hover;
« no previous file with comments | « ui/views/animation/ink_drop_host_view.h ('k') | ui/views/animation/ink_drop_hover.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698