Index: ui/views/touchui/touch_selection_controller_impl.h |
diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h |
index 158666cefc446e2597bdd345843041c03553f93b..a5964a4b887a635331e95d1f98915ee2856f94f7 100644 |
--- a/ui/views/touchui/touch_selection_controller_impl.h |
+++ b/ui/views/touchui/touch_selection_controller_impl.h |
@@ -34,12 +34,12 @@ class VIEWS_EXPORT TouchSelectionControllerImpl |
explicit TouchSelectionControllerImpl( |
ui::TouchEditable* client_view); |
- virtual ~TouchSelectionControllerImpl(); |
+ ~TouchSelectionControllerImpl() override; |
// TextSelectionController. |
- virtual void SelectionChanged() override; |
- virtual bool IsHandleDragInProgress() override; |
- virtual void HideHandles(bool quick) override; |
+ void SelectionChanged() override; |
+ bool IsHandleDragInProgress() override; |
+ void HideHandles(bool quick) override; |
private: |
friend class TouchSelectionControllerImplTest; |
@@ -65,26 +65,26 @@ class VIEWS_EXPORT TouchSelectionControllerImpl |
bool ShouldShowHandleFor(const gfx::Rect& rect) const; |
// Overridden from TouchEditingMenuController. |
- virtual bool IsCommandIdEnabled(int command_id) const override; |
- virtual void ExecuteCommand(int command_id, int event_flags) override; |
- virtual void OpenContextMenu() override; |
- virtual void OnMenuClosed(TouchEditingMenuView* menu) override; |
+ bool IsCommandIdEnabled(int command_id) const override; |
+ void ExecuteCommand(int command_id, int event_flags) override; |
+ void OpenContextMenu() override; |
+ void OnMenuClosed(TouchEditingMenuView* menu) override; |
// Overriden from aura::WindowObserver. |
- virtual void OnAncestorWindowTransformed(aura::Window* source, |
- aura::Window* window) override; |
+ void OnAncestorWindowTransformed(aura::Window* source, |
+ aura::Window* window) override; |
// Overridden from WidgetObserver. We will observe the widget backing the |
// |client_view_| so that when its moved/resized, we can update the selection |
// handles appropriately. |
- virtual void OnWidgetClosing(Widget* widget) override; |
- virtual void OnWidgetBoundsChanged(Widget* widget, |
- const gfx::Rect& new_bounds) override; |
+ void OnWidgetClosing(Widget* widget) override; |
+ void OnWidgetBoundsChanged(Widget* widget, |
+ const gfx::Rect& new_bounds) override; |
// Overriden from ui::EventHandler. |
- virtual void OnKeyEvent(ui::KeyEvent* event) override; |
- virtual void OnMouseEvent(ui::MouseEvent* event) override; |
- virtual void OnScrollEvent(ui::ScrollEvent* event) override; |
+ void OnKeyEvent(ui::KeyEvent* event) override; |
+ void OnMouseEvent(ui::MouseEvent* event) override; |
+ void OnScrollEvent(ui::ScrollEvent* event) override; |
// Time to show context menu. |
void ContextMenuTimerFired(); |