diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 10:31:58 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 10:31:58 +0000 |
| commit | 369b9b8143564392e9ff3d57e7360017368d2256 (patch) | |
| tree | 19403eeff8b34e2f835456e80724d357db5a2c38 /ui/views/events/event_x.cc | |
| parent | 5115912b027d48cb06a9413cad848c820962b22c (diff) | |
| download | chromium_src-369b9b8143564392e9ff3d57e7360017368d2256.zip chromium_src-369b9b8143564392e9ff3d57e7360017368d2256.tar.gz chromium_src-369b9b8143564392e9ff3d57e7360017368d2256.tar.bz2 | |
Rename ui::DefaultSymbolFromXEvent to ui::GetCharacterFromXEvent following suzhe's suggestion.
The new name would be more consistent since other functions that return a Unicode code point use ui::GetCharacterXXX. For example, keyboard_code_conversion.h has ui::GetCharacterFromKeyCode.
BUG=None
TEST=ran try
Review URL: http://codereview.chromium.org/8802002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/events/event_x.cc')
| -rw-r--r-- | ui/views/events/event_x.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/events/event_x.cc b/ui/views/events/event_x.cc index a50cc85..4bbb27d 100644 --- a/ui/views/events/event_x.cc +++ b/ui/views/events/event_x.cc @@ -63,7 +63,7 @@ uint16 KeyEvent::GetCharacter() const { DCHECK(native_event()->type == KeyPress || native_event()->type == KeyRelease); - uint16 ch = ui::DefaultSymbolFromXEvent(native_event()); + uint16 ch = ui::GetCharacterFromXEvent(native_event()); return ch ? ch : ui::GetCharacterFromKeyCode(key_code_, flags()); } @@ -109,7 +109,7 @@ uint16 KeyEvent::GetUnmodifiedCharacter() const { // We can't use things like (key.state & ShiftMask), as it may mask out bits // used by X11 internally. key->state &= ~kIgnoredModifiers; - uint16 ch = ui::DefaultSymbolFromXEvent(native_event()); + uint16 ch = ui::GetCharacterFromXEvent(native_event()); return ch ? ch : ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); } |