Index: ash/wm/system_gesture_event_filter.h |
diff --git a/ash/wm/system_gesture_event_filter.h b/ash/wm/system_gesture_event_filter.h |
index 825b3837626c0fa284c300ebeebc39f40a904f23..57da66274e981dd1c43ef563f8f3d271cae33dfb 100644 |
--- a/ash/wm/system_gesture_event_filter.h |
+++ b/ash/wm/system_gesture_event_filter.h |
@@ -5,8 +5,9 @@ |
#ifndef ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_ |
#define ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/events/event_handler.h" |
namespace ash { |
@@ -33,9 +34,9 @@ class SystemGestureEventFilter : public ui::EventHandler { |
private: |
friend class ash::test::SystemGestureEventFilterTest; |
- scoped_ptr<LongPressAffordanceHandler> long_press_affordance_; |
- scoped_ptr<OverviewGestureHandler> overview_gesture_handler_; |
- scoped_ptr<ShelfGestureHandler> shelf_gesture_handler_; |
+ std::unique_ptr<LongPressAffordanceHandler> long_press_affordance_; |
+ std::unique_ptr<OverviewGestureHandler> overview_gesture_handler_; |
+ std::unique_ptr<ShelfGestureHandler> shelf_gesture_handler_; |
DISALLOW_COPY_AND_ASSIGN(SystemGestureEventFilter); |
}; |