Index: ash/frame/custom_frame_view_ash.h |
diff --git a/ash/frame/custom_frame_view_ash.h b/ash/frame/custom_frame_view_ash.h |
index 892086f8f65d09a4a9727bd06c4d06ec79c7d087..b139f261b7b77b3effc1f45c6c90572d5366ee20 100644 |
--- a/ash/frame/custom_frame_view_ash.h |
+++ b/ash/frame/custom_frame_view_ash.h |
@@ -5,9 +5,10 @@ |
#ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ |
#define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ |
+#include <memory> |
+ |
#include "ash/ash_export.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "third_party/skia/include/core/SkColor.h" |
#include "ui/views/window/non_client_view.h" |
@@ -94,7 +95,8 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView { |
HeaderView* header_view_; |
// Updates the hittest bounds overrides based on the window state type. |
- scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; |
+ std::unique_ptr<FrameBorderHitTestController> |
+ frame_border_hit_test_controller_; |
DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); |
}; |