| Index: views/events/event_aura.cc
|
| diff --git a/views/events/event_aura.cc b/views/events/event_aura.cc
|
| index bf6a1c5f0fc2e87b2924cac42eba84b149df5f3c..a4d31690349868c432b4162693e821174be966a0 100644
|
| --- a/views/events/event_aura.cc
|
| +++ b/views/events/event_aura.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "ui/aura/event.h"
|
| +#include "ui/base/keycodes/keyboard_code_conversion.h"
|
|
|
| namespace views {
|
|
|
| @@ -35,7 +36,7 @@ TouchEvent::TouchEvent(const NativeEvent& event)
|
| KeyEvent::KeyEvent(const NativeEvent& native_event)
|
| : Event(native_event, native_event->type(), native_event->flags()),
|
| key_code_(static_cast<aura::KeyEvent*>(native_event)->key_code()),
|
| - character_(GetCharacterFromKeyCode(key_code_, flags())),
|
| + character_(ui::GetCharacterFromKeyCode(key_code_, flags())),
|
| unmodified_character_(0) {
|
| }
|
|
|
| @@ -47,7 +48,7 @@ uint16 KeyEvent::GetUnmodifiedCharacter() const {
|
| if (unmodified_character_)
|
| return unmodified_character_;
|
|
|
| - return GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
|
| + return ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|