Index: ui/android/edge_effect.h |
diff --git a/ui/android/edge_effect.h b/ui/android/edge_effect.h |
index de1bb15836f80fafcd406fee9a28e8fd171cec94..67dd6f37253d49541b57cf81156c38616eebe41d 100644 |
--- a/ui/android/edge_effect.h |
+++ b/ui/android/edge_effect.h |
@@ -5,8 +5,9 @@ |
#ifndef UI_ANDROID_EDGE_EFFECT_H_ |
#define UI_ANDROID_EDGE_EFFECT_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/android/edge_effect_base.h" |
#include "ui/android/ui_android_export.h" |
@@ -51,8 +52,8 @@ class UI_ANDROID_EXPORT EdgeEffect : public EdgeEffectBase { |
private: |
class EffectLayer; |
- scoped_ptr<EffectLayer> edge_; |
- scoped_ptr<EffectLayer> glow_; |
+ std::unique_ptr<EffectLayer> edge_; |
+ std::unique_ptr<EffectLayer> glow_; |
float base_edge_height_; |
float base_glow_height_; |