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

Unified Diff: views/events/event_win.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_wayland.cc ('k') | views/events/event_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/events/event_win.cc
diff --git a/views/events/event_win.cc b/views/events/event_win.cc
index b066c2d8983b7b7ea300963043898419a616b538..03b855e4be6f21b66d8ca8153ea8a3fcf87e9c0a 100644
--- a/views/events/event_win.cc
+++ b/views/events/event_win.cc
@@ -5,6 +5,7 @@
#include "views/events/event.h"
#include "base/logging.h"
+#include "ui/base/keycodes/keyboard_code_conversion.h"
namespace views {
@@ -15,7 +16,7 @@ uint16 KeyEvent::GetCharacter() const {
if (character_)
return character_;
return (native_event().message == WM_CHAR) ? key_code_ :
- GetCharacterFromKeyCode(key_code_, flags());
+ ui::GetCharacterFromKeyCode(key_code_, flags());
}
uint16 KeyEvent::GetUnmodifiedCharacter() const {
@@ -23,7 +24,7 @@ uint16 KeyEvent::GetUnmodifiedCharacter() const {
return unmodified_character_;
// Looks like there is no way to get unmodified character on Windows.
return (native_event().message == WM_CHAR) ? key_code_ :
- GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
+ ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
}
} // namespace views
« no previous file with comments | « views/events/event_wayland.cc ('k') | views/events/event_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698