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

Unified Diff: ui/views/animation/ink_drop_host_view.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_host.h ('k') | ui/views/animation/ink_drop_host_view.cc » ('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.h
diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h
index 3a3efa6b6ed6be0ef124608917105695447f8824..35f712c0063bf724985dc117389d61868f233f97 100644
--- a/ui/views/animation/ink_drop_host_view.h
+++ b/ui/views/animation/ink_drop_host_view.h
@@ -5,7 +5,8 @@
#ifndef UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
#define UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/geometry/size.h"
#include "ui/views/animation/ink_drop_host.h"
@@ -25,8 +26,8 @@ class VIEWS_EXPORT InkDropHostView : public views::View, public InkDropHost {
// Overridden from views::InkDropHost:
void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
- scoped_ptr<InkDropAnimation> CreateInkDropAnimation() const override;
- scoped_ptr<InkDropHover> CreateInkDropHover() const override;
+ std::unique_ptr<InkDropAnimation> CreateInkDropAnimation() const override;
+ std::unique_ptr<InkDropHover> CreateInkDropHover() const override;
void set_ink_drop_size(const gfx::Size& size) { ink_drop_size_ = size; }
« no previous file with comments | « ui/views/animation/ink_drop_host.h ('k') | ui/views/animation/ink_drop_host_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698