Chromium Code Reviews| Index: content/renderer/gpu/input_handler_proxy.h |
| diff --git a/content/renderer/gpu/input_handler_proxy.h b/content/renderer/gpu/input_handler_proxy.h |
| index b6c6efd7b4b05bc146cb0fd620a5c94f144373fa..e4372a006787a139a51baf6ec15c07de51e84095 100644 |
| --- a/content/renderer/gpu/input_handler_proxy.h |
| +++ b/content/renderer/gpu/input_handler_proxy.h |
| @@ -10,6 +10,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "cc/input/input_handler.h" |
| #include "content/common/content_export.h" |
| +#include "content/port/common/input_event_ack_state.h" |
| #include "third_party/WebKit/public/platform/WebGestureCurve.h" |
| #include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h" |
| @@ -31,7 +32,13 @@ class CONTENT_EXPORT InputHandlerProxy |
| virtual ~InputHandlerProxy(); |
| void SetClient(InputHandlerProxyClient* client); |
| - void HandleInputEvent(const WebKit::WebInputEvent& event); |
| + |
| + enum EventDisposition { |
| + DidHandle, |
|
jamesr
2013/06/03 20:45:59
enums in chromium code should always be SHOUTING_S
jdduke (slow)
2013/06/03 21:40:42
Yeah, I really just moved the internal, intermedia
|
| + DidNotHandle, |
| + DropEvent |
| + }; |
| + EventDisposition HandleInputEvent(const WebKit::WebInputEvent& event); |
| // cc::InputHandlerClient implementation. |
| virtual void WillShutdown() OVERRIDE; |
| @@ -49,11 +56,6 @@ class CONTENT_EXPORT InputHandlerProxy |
| } |
| private: |
| - enum EventDisposition { |
| - DidHandle, |
| - DidNotHandle, |
| - DropEvent |
| - }; |
| // This function processes the input event and determines the disposition, but |
| // does not make any calls out to the InputHandlerProxyClient. Some input |
| // types defer to helpers. |