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

Unified Diff: ui/views/animation/test/test_ink_drop_host.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/test/test_ink_drop_host.h ('k') | ui/views/border.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/test/test_ink_drop_host.cc
diff --git a/ui/views/animation/test/test_ink_drop_host.cc b/ui/views/animation/test/test_ink_drop_host.cc
index 5b46b0da280527e5f37fce203d3894c117154b66..c919b685b3c9046a565ac4b883757f8e6c2001c6 100644
--- a/ui/views/animation/test/test_ink_drop_host.cc
+++ b/ui/views/animation/test/test_ink_drop_host.cc
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/views/animation/test/test_ink_drop_host.h"
+
+#include "base/memory/ptr_util.h"
#include "ui/gfx/geometry/size.h"
#include "ui/views/animation/ink_drop_hover.h"
#include "ui/views/animation/square_ink_drop_animation.h"
-#include "ui/views/animation/test/test_ink_drop_host.h"
namespace views {
@@ -22,16 +24,17 @@ void TestInkDropHost::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
--num_ink_drop_layers_;
}
-scoped_ptr<InkDropAnimation> TestInkDropHost::CreateInkDropAnimation() const {
+std::unique_ptr<InkDropAnimation> TestInkDropHost::CreateInkDropAnimation()
+ const {
gfx::Size size(10, 10);
- return make_scoped_ptr(new SquareInkDropAnimation(
+ return base::WrapUnique(new SquareInkDropAnimation(
size, 5, size, 5, gfx::Point(), SK_ColorBLACK));
}
-scoped_ptr<InkDropHover> TestInkDropHost::CreateInkDropHover() const {
+std::unique_ptr<InkDropHover> TestInkDropHost::CreateInkDropHover() const {
return should_show_hover_
- ? make_scoped_ptr(new InkDropHover(gfx::Size(10, 10), 4,
- gfx::Point(), SK_ColorBLACK))
+ ? base::WrapUnique(new InkDropHover(gfx::Size(10, 10), 4,
+ gfx::Point(), SK_ColorBLACK))
: nullptr;
}
« no previous file with comments | « ui/views/animation/test/test_ink_drop_host.h ('k') | ui/views/border.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698