| 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 c0938e7011de95f347b982b2225eb54e8c81e018..4ae4a65f60120b9b13f89d00bdc1e8b589e74be8 100644
|
| --- a/content/browser/renderer_host/native_web_keyboard_event_aura.cc
|
| +++ b/content/browser/renderer_host/native_web_keyboard_event_aura.cc
|
| @@ -5,8 +5,8 @@
|
| #include "content/public/browser/native_web_keyboard_event.h"
|
|
|
| #include "base/logging.h"
|
| -#include "content/browser/renderer_host/web_input_event_aura.h"
|
| #include "ui/events/base_event_utils.h"
|
| +#include "ui/events/blink/web_input_event.h"
|
| #include "ui/events/event.h"
|
|
|
| namespace {
|
| @@ -35,10 +35,9 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)
|
| }
|
|
|
| NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event)
|
| - : WebKeyboardEvent(MakeWebKeyboardEvent(key_event)),
|
| + : WebKeyboardEvent(ui::MakeWebKeyboardEvent(key_event)),
|
| os_event(CopyEvent(&key_event)),
|
| - skip_in_browser(false) {
|
| -}
|
| + skip_in_browser(false) {}
|
|
|
| NativeWebKeyboardEvent::NativeWebKeyboardEvent(
|
| const NativeWebKeyboardEvent& other)
|
| @@ -49,7 +48,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent(
|
|
|
| NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event,
|
| base::char16 character)
|
| - : WebKeyboardEvent(MakeWebKeyboardEvent(key_event)),
|
| + : WebKeyboardEvent(ui::MakeWebKeyboardEvent(key_event)),
|
| os_event(NULL),
|
| skip_in_browser(false) {
|
| type = blink::WebInputEvent::Char;
|
|
|