Index: mash/wm/frame/default_header_painter.h |
diff --git a/mash/wm/frame/default_header_painter.h b/mash/wm/frame/default_header_painter.h |
index c2763e69416005f26e1cb8310543483b93b5143c..61d2c6e9f72b86c50ac131c01b5d447610466212 100644 |
--- a/mash/wm/frame/default_header_painter.h |
+++ b/mash/wm/frame/default_header_painter.h |
@@ -5,8 +5,9 @@ |
#ifndef MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_ |
#define MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "mash/wm/frame/header_painter.h" |
#include "third_party/skia/include/core/SkColor.h" |
#include "ui/gfx/animation/animation_delegate.h" |
@@ -105,7 +106,7 @@ class DefaultHeaderPainter : public HeaderPainter, |
// Whether the header is painted for the first time. |
bool initial_paint_; |
- scoped_ptr<gfx::SlideAnimation> activation_animation_; |
+ std::unique_ptr<gfx::SlideAnimation> activation_animation_; |
DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter); |
}; |