Index: ash/display/shared_display_edge_indicator.h |
diff --git a/ash/display/shared_display_edge_indicator.h b/ash/display/shared_display_edge_indicator.h |
index d08fd59cb38cd10a51d8d2072a868d0584285bf0..e9e30d7881a2dfdc37d9ddfad392518c2b9dc5b6 100644 |
--- a/ash/display/shared_display_edge_indicator.h |
+++ b/ash/display/shared_display_edge_indicator.h |
@@ -5,9 +5,10 @@ |
#ifndef ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_ |
#define ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_ |
+#include <memory> |
+ |
#include "ash/ash_export.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/gfx/animation/animation_delegate.h" |
#include "ui/gfx/display.h" |
@@ -47,7 +48,7 @@ class ASH_EXPORT SharedDisplayEdgeIndicator : public gfx::AnimationDelegate { |
views::View* dst_indicator_; |
// Used to transition the opacity. |
- scoped_ptr<gfx::ThrobAnimation> animation_; |
+ std::unique_ptr<gfx::ThrobAnimation> animation_; |
DISALLOW_COPY_AND_ASSIGN(SharedDisplayEdgeIndicator); |
}; |