Index: ui/chromeos/touch_exploration_controller.h |
diff --git a/ui/chromeos/touch_exploration_controller.h b/ui/chromeos/touch_exploration_controller.h |
index e7a0d9cd7a872fd9b056da4b1e7ec38fa9ca4143..00fe1bb20f56ecd4612839528724f5ab5cdef19b 100644 |
--- a/ui/chromeos/touch_exploration_controller.h |
+++ b/ui/chromeos/touch_exploration_controller.h |
@@ -179,38 +179,51 @@ class UI_CHROMEOS_EXPORT TouchExplorationController |
// Overridden from ui::EventRewriter |
ui::EventRewriteStatus RewriteEvent( |
const ui::Event& event, |
- scoped_ptr<ui::Event>* rewritten_event) override; |
+ std::unique_ptr<ui::Event>* rewritten_event) override; |
ui::EventRewriteStatus NextDispatchEvent( |
const ui::Event& last_event, |
- scoped_ptr<ui::Event>* new_event) override; |
+ std::unique_ptr<ui::Event>* new_event) override; |
// Event handlers based on the current state - see State, below. |
ui::EventRewriteStatus InNoFingersDown( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InSingleTapPressed( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InSingleTapOrTouchExploreReleased( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InDoubleTapPending( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InTouchReleasePending( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InTouchExploration( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InCornerPassthrough( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InOneFingerPassthrough( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InGestureInProgress( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InTouchExploreSecondPress( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InWaitForNoFingers( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InSlideGesture( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
ui::EventRewriteStatus InTwoFingerTap( |
- const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event); |
+ const ui::TouchEvent& event, |
+ std::unique_ptr<ui::Event>* rewritten_event); |
// Returns the current time of the tick clock. |
base::TimeDelta Now(); |
@@ -261,8 +274,9 @@ class UI_CHROMEOS_EXPORT TouchExplorationController |
// Binds DispatchKeyWithFlags to a specific key and flags. |
base::Closure BindKeyEventWithFlags(const ui::KeyboardCode key, int flags); |
- scoped_ptr<ui::MouseEvent> CreateMouseMoveEvent(const gfx::PointF& location, |
- int flags); |
+ std::unique_ptr<ui::MouseEvent> CreateMouseMoveEvent( |
+ const gfx::PointF& location, |
+ int flags); |
void EnterTouchToMouseMode(); |
@@ -419,7 +433,7 @@ class UI_CHROMEOS_EXPORT TouchExplorationController |
State state_; |
// A copy of the event from the initial touch press. |
- scoped_ptr<ui::TouchEvent> initial_press_; |
+ std::unique_ptr<ui::TouchEvent> initial_press_; |
// Map of touch ids to where its initial press occurred relative to the |
// screen. |
@@ -432,11 +446,11 @@ class UI_CHROMEOS_EXPORT TouchExplorationController |
// Stores the most recent event from a finger that is currently not |
// sending events through, but might in the future (e.g. before a finger |
// enters double-tap-hold passthrough, we need to update its location.) |
- scoped_ptr<ui::TouchEvent> last_unused_finger_event_; |
+ std::unique_ptr<ui::TouchEvent> last_unused_finger_event_; |
// The last synthesized mouse move event. When the user double-taps, |
// we send the passed-through tap to the location of this event. |
- scoped_ptr<ui::TouchEvent> last_touch_exploration_; |
+ std::unique_ptr<ui::TouchEvent> last_touch_exploration_; |
// A timer that fires after the double-tap delay. |
base::OneShotTimer tap_timer_; |
@@ -452,13 +466,13 @@ class UI_CHROMEOS_EXPORT TouchExplorationController |
ui::GestureDetector::Config gesture_detector_config_; |
// Gesture Handler to interpret the touch events. |
- scoped_ptr<ui::GestureProviderAura> gesture_provider_; |
+ std::unique_ptr<ui::GestureProviderAura> gesture_provider_; |
// The previous state entered. |
State prev_state_; |
// A copy of the previous event passed. |
- scoped_ptr<ui::TouchEvent> prev_event_; |
+ std::unique_ptr<ui::TouchEvent> prev_event_; |
// This toggles whether VLOGS are turned on or not. |
bool VLOG_on_; |