| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "views/events/event.h" | 5 #include "ui/views/events/event.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "ui/base/keycodes/keyboard_code_conversion.h" | 8 #include "ui/base/keycodes/keyboard_code_conversion.h" |
| 9 | 9 |
| 10 namespace views { | 10 namespace views { |
| 11 | 11 |
| 12 //////////////////////////////////////////////////////////////////////////////// | 12 //////////////////////////////////////////////////////////////////////////////// |
| 13 // KeyEvent, public: | 13 // KeyEvent, public: |
| 14 | 14 |
| 15 uint16 KeyEvent::GetCharacter() const { | 15 uint16 KeyEvent::GetCharacter() const { |
| 16 if (character_) | 16 if (character_) |
| 17 return character_; | 17 return character_; |
| 18 return (native_event().message == WM_CHAR) ? key_code_ : | 18 return (native_event().message == WM_CHAR) ? key_code_ : |
| 19 ui::GetCharacterFromKeyCode(key_code_, flags()); | 19 ui::GetCharacterFromKeyCode(key_code_, flags()); |
| 20 } | 20 } |
| 21 | 21 |
| 22 uint16 KeyEvent::GetUnmodifiedCharacter() const { | 22 uint16 KeyEvent::GetUnmodifiedCharacter() const { |
| 23 if (unmodified_character_) | 23 if (unmodified_character_) |
| 24 return unmodified_character_; | 24 return unmodified_character_; |
| 25 // Looks like there is no way to get unmodified character on Windows. | 25 // Looks like there is no way to get unmodified character on Windows. |
| 26 return (native_event().message == WM_CHAR) ? key_code_ : | 26 return (native_event().message == WM_CHAR) ? key_code_ : |
| 27 ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); | 27 ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); |
| 28 } | 28 } |
| 29 | 29 |
| 30 } // namespace views | 30 } // namespace views |
| OLD | NEW |