Index: content/browser/renderer_host/web_input_event_aura.h |
=================================================================== |
--- content/browser/renderer_host/web_input_event_aura.h (revision 150582) |
+++ content/browser/renderer_host/web_input_event_aura.h (working copy) |
@@ -8,34 +8,34 @@ |
#include "content/common/content_export.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
-namespace aura { |
-class GestureEvent; |
+namespace ui { |
+class GestureEventImpl; |
class KeyEvent; |
class MouseEvent; |
class ScrollEvent; |
-class TouchEvent; |
+class TouchEventImpl; |
} |
namespace content { |
CONTENT_EXPORT WebKit::WebMouseEvent MakeWebMouseEvent( |
- aura::MouseEvent* event); |
+ ui::MouseEvent* event); |
CONTENT_EXPORT WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent( |
- aura::MouseEvent* event); |
+ ui::MouseEvent* event); |
CONTENT_EXPORT WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent( |
- aura::ScrollEvent* event); |
+ ui::ScrollEvent* event); |
CONTENT_EXPORT WebKit::WebKeyboardEvent MakeWebKeyboardEvent( |
- aura::KeyEvent* event); |
+ ui::KeyEvent* event); |
CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEvent( |
- aura::GestureEvent* event); |
+ ui::GestureEventImpl* event); |
CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEvent( |
- aura::ScrollEvent* event); |
+ ui::ScrollEvent* event); |
CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEventFlingCancel(); |
// Updates the WebTouchEvent based on the TouchEvent. It returns the updated |
// WebTouchPoint contained in the WebTouchEvent, or NULL if no point was |
// updated. |
-WebKit::WebTouchPoint* UpdateWebTouchEvent(aura::TouchEvent* event, |
+WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEventImpl* event, |
WebKit::WebTouchEvent* web_event); |
} |