Chromium Code Reviews| Index: content/browser/renderer_host/native_web_keyboard_event_android.cc |
| diff --git a/content/browser/renderer_host/native_web_keyboard_event_android.cc b/content/browser/renderer_host/native_web_keyboard_event_android.cc |
| index 94f3a4ac0be0ed69b6464a0c3b9ae309d5f3992f..bea32063a3ba10afd88f4e08270eccdf2ad28574 100644 |
| --- a/content/browser/renderer_host/native_web_keyboard_event_android.cc |
| +++ b/content/browser/renderer_host/native_web_keyboard_event_android.cc |
| @@ -6,6 +6,7 @@ |
| #include "base/android/jni_android.h" |
| #include "content/browser/renderer_host/input/web_input_event_builders_android.h" |
| +#include "ui/events/base_event_utils.h" |
| #include "ui/gfx/native_widget_types.h" |
| namespace { |
| @@ -24,10 +25,19 @@ void DeleteGlobalRefForKeyEvent(jobject key_event) { |
| namespace content { |
| -NativeWebKeyboardEvent::NativeWebKeyboardEvent() |
| - : os_event(nullptr), |
| - 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( |
| JNIEnv* env, |