Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: content/browser/renderer_host/input/touch_selection_controller.h

Issue 616603004: Replacing the OVERRIDE with override and FINAL with final in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_
7 7
8 #include "cc/output/viewport_selection_bound.h" 8 #include "cc/output/viewport_selection_bound.h"
9 #include "content/browser/renderer_host/input/selection_event_type.h" 9 #include "content/browser/renderer_host/input/selection_event_type.h"
10 #include "content/browser/renderer_host/input/touch_handle.h" 10 #include "content/browser/renderer_host/input/touch_handle.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void OnSelectionEmpty(bool empty); 79 void OnSelectionEmpty(bool empty);
80 80
81 // Ticks an active animation, as requested to the client by |SetNeedsAnimate|. 81 // Ticks an active animation, as requested to the client by |SetNeedsAnimate|.
82 // Returns true if an animation is active and requires further ticking. 82 // Returns true if an animation is active and requires further ticking.
83 bool Animate(base::TimeTicks animate_time); 83 bool Animate(base::TimeTicks animate_time);
84 84
85 private: 85 private:
86 enum InputEventType { TAP, LONG_PRESS, INPUT_EVENT_TYPE_NONE }; 86 enum InputEventType { TAP, LONG_PRESS, INPUT_EVENT_TYPE_NONE };
87 87
88 // TouchHandleClient implementation. 88 // TouchHandleClient implementation.
89 virtual void OnHandleDragBegin(const TouchHandle& handle) OVERRIDE; 89 virtual void OnHandleDragBegin(const TouchHandle& handle) override;
90 virtual void OnHandleDragUpdate(const TouchHandle& handle, 90 virtual void OnHandleDragUpdate(const TouchHandle& handle,
91 const gfx::PointF& new_position) OVERRIDE; 91 const gfx::PointF& new_position) override;
92 virtual void OnHandleDragEnd(const TouchHandle& handle) OVERRIDE; 92 virtual void OnHandleDragEnd(const TouchHandle& handle) override;
93 virtual void OnHandleTapped(const TouchHandle& handle) OVERRIDE; 93 virtual void OnHandleTapped(const TouchHandle& handle) override;
94 virtual void SetNeedsAnimate() OVERRIDE; 94 virtual void SetNeedsAnimate() override;
95 virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE; 95 virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override;
96 virtual base::TimeDelta GetTapTimeout() const OVERRIDE; 96 virtual base::TimeDelta GetTapTimeout() const override;
97 virtual float GetTapSlop() const OVERRIDE; 97 virtual float GetTapSlop() const override;
98 98
99 void ShowInsertionHandleAutomatically(); 99 void ShowInsertionHandleAutomatically();
100 void ShowSelectionHandlesAutomatically(); 100 void ShowSelectionHandlesAutomatically();
101 101
102 void OnInsertionChanged(); 102 void OnInsertionChanged();
103 void OnSelectionChanged(); 103 void OnSelectionChanged();
104 104
105 void ActivateInsertion(); 105 void ActivateInsertion();
106 void DeactivateInsertion(); 106 void DeactivateInsertion();
107 void ActivateSelection(); 107 void ActivateSelection();
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 bool selection_editable_; 141 bool selection_editable_;
142 142
143 bool temporarily_hidden_; 143 bool temporarily_hidden_;
144 144
145 DISALLOW_COPY_AND_ASSIGN(TouchSelectionController); 145 DISALLOW_COPY_AND_ASSIGN(TouchSelectionController);
146 }; 146 };
147 147
148 } // namespace content 148 } // namespace content
149 149
150 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_ 150 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698