Chromium Code Reviews| Index: content/browser/renderer_host/native_web_keyboard_event_aura.cc |
| diff --git a/content/browser/renderer_host/native_web_keyboard_event_aura.cc b/content/browser/renderer_host/native_web_keyboard_event_aura.cc |
| index 4ae4a65f60120b9b13f89d00bdc1e8b589e74be8..da7c2abab7dfcd8d080bbd70937d31da52508728 100644 |
| --- a/content/browser/renderer_host/native_web_keyboard_event_aura.cc |
| +++ b/content/browser/renderer_host/native_web_keyboard_event_aura.cc |
| @@ -25,10 +25,19 @@ using blink::WebKeyboardEvent; |
| namespace content { |
| -NativeWebKeyboardEvent::NativeWebKeyboardEvent() |
| - : os_event(NULL), |
| - skip_in_browser(false) { |
| -} |
| +NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebInputEvent::Type type, |
| + int modifiers, |
| + base::TimeTicks timestamp) |
| + : NativeWebKeyboardEvent(type, |
| + modifiers, |
| + ui::EventTimeStampToSeconds(timestamp)) {} |
| + |
| +NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebInputEvent::Type type, |
| + int modifiers, |
| + double timestampSeconds) |
| + : WebKeyboardEvent(type, modifiers, timestampSeconds), |
| + os_event(NULL), |
|
majidvp
2016/12/19 20:09:52
s/NULL/nullptr/
dtapuska
2016/12/20 19:49:21
Done.
|
| + skip_in_browser(false) {} |
| NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event) |
| : NativeWebKeyboardEvent(static_cast<ui::KeyEvent&>(*native_event)) { |