diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 19:53:58 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 19:53:58 +0000 |
| commit | 984eab9691b5faab1bc8bc48dc30e929c608d738 (patch) | |
| tree | a3be1e195ac726b12f04b06e4ae90300c13c8013 /views/events | |
| parent | fd0a700ffb9c91eead64f8c56f263e37b2dda524 (diff) | |
| download | chromium_src-984eab9691b5faab1bc8bc48dc30e929c608d738.zip chromium_src-984eab9691b5faab1bc8bc48dc30e929c608d738.tar.gz chromium_src-984eab9691b5faab1bc8bc48dc30e929c608d738.tar.bz2 | |
Fix the KeyEvent unit test failure due to the aura implementation of GetUnmodifiedCharacter().
BUG=99129
TEST=NONE
Review URL: http://codereview.chromium.org/8286006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/events')
| -rw-r--r-- | views/events/event_aura.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/views/events/event_aura.cc b/views/events/event_aura.cc index b4e8d94..dca43fd 100644 --- a/views/events/event_aura.cc +++ b/views/events/event_aura.cc @@ -32,7 +32,10 @@ uint16 KeyEvent::GetCharacter() const { } uint16 KeyEvent::GetUnmodifiedCharacter() const { - return unmodified_character_; + if (unmodified_character_) + return unmodified_character_; + + return GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); } //////////////////////////////////////////////////////////////////////////////// |