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

Unified Diff: content/browser/renderer_host/web_input_event_aura.h

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/browser/renderer_host/web_input_event_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698