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

Unified Diff: ui/android/overscroll_glow.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/android/edge_effect_l.h ('k') | ui/android/resources/crushed_sprite_resource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/overscroll_glow.h
diff --git a/ui/android/overscroll_glow.h b/ui/android/overscroll_glow.h
index 4a40c97227d200bad4effad61b6490917faf2b1e..8253de04575409bc89361f322adc9399fa1c124f 100644
--- a/ui/android/overscroll_glow.h
+++ b/ui/android/overscroll_glow.h
@@ -5,9 +5,10 @@
#ifndef UI_ANDROID_OVERSCROLL_GLOW_H_
#define UI_ANDROID_OVERSCROLL_GLOW_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "ui/android/edge_effect_base.h"
#include "ui/android/ui_android_export.h"
@@ -26,7 +27,7 @@ class UI_ANDROID_EXPORT OverscrollGlowClient {
virtual ~OverscrollGlowClient() {}
// Called lazily, after the initial overscrolling event.
- virtual scoped_ptr<EdgeEffectBase> CreateEdgeEffect() = 0;
+ virtual std::unique_ptr<EdgeEffectBase> CreateEdgeEffect() = 0;
};
/* |OverscrollGlow| mirrors its Android counterpart, OverscrollGlow.java.
@@ -94,7 +95,7 @@ class UI_ANDROID_EXPORT OverscrollGlow {
EdgeEffectBase* GetOppositeEdge(int edge_index);
OverscrollGlowClient* const client_;
- scoped_ptr<EdgeEffectBase> edge_effects_[EDGE_COUNT];
+ std::unique_ptr<EdgeEffectBase> edge_effects_[EDGE_COUNT];
gfx::SizeF viewport_size_;
float edge_offsets_[EDGE_COUNT];
« no previous file with comments | « ui/android/edge_effect_l.h ('k') | ui/android/resources/crushed_sprite_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698