Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(667)

Unified Diff: views/events/event_aura.cc

Issue 8511061: Move GetCharacterFromKeyCode from views::KeyEvent to ui/base/keycodes/keyboard_code_conversion.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/events/event.cc ('k') | views/events/event_wayland.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « views/events/event.cc ('k') | views/events/event_wayland.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698