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

Unified Diff: ui/views/animation/ink_drop_host.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_unittest.cc ('k') | ui/views/animation/ink_drop_host_view.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.h
diff --git a/ui/views/animation/ink_drop_host.h b/ui/views/animation/ink_drop_host.h
index 570f2710b4913ff3c2b4b659dff16f2fb07448d9..8d6dcb229e8087a98a2ac955995ce28e2f9921a1 100644
--- a/ui/views/animation/ink_drop_host.h
+++ b/ui/views/animation/ink_drop_host.h
@@ -5,8 +5,9 @@
#ifndef UI_VIEWS_ANIMATION_INK_DROP_HOST_H_
#define UI_VIEWS_ANIMATION_INK_DROP_HOST_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/gfx/geometry/point.h"
#include "ui/views/views_export.h"
@@ -38,10 +39,10 @@ class VIEWS_EXPORT InkDropHost {
virtual void RemoveInkDropLayer(ui::Layer* ink_drop_layer) = 0;
// Creates and returns the effect used for press.
- virtual scoped_ptr<InkDropAnimation> CreateInkDropAnimation() const = 0;
+ virtual std::unique_ptr<InkDropAnimation> CreateInkDropAnimation() const = 0;
// Creates and returns the effect used for hover.
- virtual scoped_ptr<InkDropHover> CreateInkDropHover() const = 0;
+ virtual std::unique_ptr<InkDropHover> CreateInkDropHover() const = 0;
private:
DISALLOW_COPY_AND_ASSIGN(InkDropHost);
« no previous file with comments | « ui/views/animation/ink_drop_animation_unittest.cc ('k') | ui/views/animation/ink_drop_host_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698