Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_WEB_INPUT_EVENT_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 10 | 10 |
| 11 namespace aura { | 11 namespace aura { |
| 12 class KeyEvent; | 12 class KeyEvent; |
| 13 class MouseEvent; | 13 class MouseEvent; |
| 14 class TouchEvent; | 14 class TouchEvent; |
| 15 class Window; | |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace content { | 18 namespace content { |
| 18 | 19 |
| 19 WebKit::WebMouseEvent MakeWebMouseEvent(aura::MouseEvent* event); | 20 WebKit::WebMouseEvent MakeWebMouseEvent(aura::MouseEvent* event, |
| 20 WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(aura::MouseEvent* event); | 21 aura::Window* window); |
|
Ben Goodger (Google)
2011/10/27 22:56:11
rename window to target. It becomes self documenti
Daniel Erat
2011/10/28 00:53:13
Done.
| |
| 22 WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(aura::MouseEvent* event, | |
| 23 aura::Window* window); | |
| 21 WebKit::WebKeyboardEvent MakeWebKeyboardEvent(aura::KeyEvent* event); | 24 WebKit::WebKeyboardEvent MakeWebKeyboardEvent(aura::KeyEvent* event); |
| 22 | 25 |
| 23 // Updates the WebTouchEvent based on the TouchEvent. It returns the updated | 26 // Updates the WebTouchEvent based on the TouchEvent. It returns the updated |
| 24 // WebTouchPoint contained in the WebTouchEvent, or NULL if no point was | 27 // WebTouchPoint contained in the WebTouchEvent, or NULL if no point was |
| 25 // updated. | 28 // updated. |
| 26 WebKit::WebTouchPoint* UpdateWebTouchEvent(aura::TouchEvent* event, | 29 WebKit::WebTouchPoint* UpdateWebTouchEvent(aura::TouchEvent* event, |
| 27 WebKit::WebTouchEvent* web_event); | 30 WebKit::WebTouchEvent* web_event); |
| 28 | 31 |
| 29 | 32 |
| 30 } | 33 } |
| 31 | 34 |
| 32 #endif // CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ | 35 #endif // CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ |
| OLD | NEW |