| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_OVERSCROLL_CONTROLLER_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_OVERSCROLL_CONTROLLER_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_OVERSCROLL_CONTROLLER_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_OVERSCROLL_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "third_party/WebKit/public/web/WebInputEvent.h" | 10 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 ScrollState scroll_state_; | 115 ScrollState scroll_state_; |
| 116 | 116 |
| 117 // The amount of overscroll in progress. These values are invalid when | 117 // The amount of overscroll in progress. These values are invalid when |
| 118 // |overscroll_mode_| is set to OVERSCROLL_NONE. | 118 // |overscroll_mode_| is set to OVERSCROLL_NONE. |
| 119 float overscroll_delta_x_; | 119 float overscroll_delta_x_; |
| 120 float overscroll_delta_y_; | 120 float overscroll_delta_y_; |
| 121 | 121 |
| 122 // The delegate that receives the overscroll updates. The delegate is not | 122 // The delegate that receives the overscroll updates. The delegate is not |
| 123 // owned by this controller. | 123 // owned by this controller. |
| 124 OverscrollControllerDelegate* delegate_; | 124 OverscrollControllerDelegate* delegate_; |
| 125 bool use_gesture_wheel_scrolling_; | |
| 126 | 125 |
| 127 DISALLOW_COPY_AND_ASSIGN(OverscrollController); | 126 DISALLOW_COPY_AND_ASSIGN(OverscrollController); |
| 128 }; | 127 }; |
| 129 | 128 |
| 130 } // namespace content | 129 } // namespace content |
| 131 | 130 |
| 132 #endif // CONTENT_BROWSER_RENDERER_HOST_OVERSCROLL_CONTROLLER_H_ | 131 #endif // CONTENT_BROWSER_RENDERER_HOST_OVERSCROLL_CONTROLLER_H_ |
| OLD | NEW |