| Index: ui/chromeos/touch_exploration_controller.h
|
| diff --git a/ui/chromeos/touch_exploration_controller.h b/ui/chromeos/touch_exploration_controller.h
|
| index 2f428a56a7d271fae0425cb19f02a2e45cb3bd91..ea46fd5647e9c5aef4067e6277aadf228070d421 100644
|
| --- a/ui/chromeos/touch_exploration_controller.h
|
| +++ b/ui/chromeos/touch_exploration_controller.h
|
| @@ -169,17 +169,18 @@ class UI_CHROMEOS_EXPORT TouchExplorationController
|
| explicit TouchExplorationController(
|
| aura::Window* root_window,
|
| ui::TouchExplorationControllerDelegate* delegate);
|
| - virtual ~TouchExplorationController();
|
| + ~TouchExplorationController() override;
|
|
|
| private:
|
| friend class TouchExplorationControllerTestApi;
|
|
|
| // Overridden from ui::EventRewriter
|
| - virtual ui::EventRewriteStatus RewriteEvent(
|
| + ui::EventRewriteStatus RewriteEvent(
|
| const ui::Event& event,
|
| scoped_ptr<ui::Event>* rewritten_event) override;
|
| - virtual ui::EventRewriteStatus NextDispatchEvent(
|
| - const ui::Event& last_event, scoped_ptr<ui::Event>* new_event) override;
|
| + ui::EventRewriteStatus NextDispatchEvent(
|
| + const ui::Event& last_event,
|
| + scoped_ptr<ui::Event>* new_event) override;
|
|
|
| // Event handlers based on the current state - see State, below.
|
| ui::EventRewriteStatus InNoFingersDown(
|
| @@ -235,7 +236,7 @@ class UI_CHROMEOS_EXPORT TouchExplorationController
|
| // the user moves fast enough to trigger a gesture. After the user
|
| // completes their gesture, this method will decide what keyboard
|
| // input their gesture corresponded to.
|
| - virtual void OnGestureEvent(ui::GestureEvent* gesture) override;
|
| + void OnGestureEvent(ui::GestureEvent* gesture) override;
|
|
|
| // Process the gesture events that have been created.
|
| void ProcessGestureEvents();
|
|
|