| Index: views/controls/textfield/textfield.cc
|
| diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
|
| index 81c74d26aebbf74aab3576d4b28de99002769a68..e92794daae21721d34adbe55ca34f6ed6a7850e4 100644
|
| --- a/views/controls/textfield/textfield.cc
|
| +++ b/views/controls/textfield/textfield.cc
|
| @@ -358,8 +358,7 @@ app::KeyboardCode Textfield::Keystroke::GetKeyboardCode() const {
|
| #if defined(OS_WIN)
|
| return static_cast<app::KeyboardCode>(key_);
|
| #else
|
| - return static_cast<app::KeyboardCode>(
|
| - app::WindowsKeyCodeForGdkKeyCode(event_.keyval));
|
| + return event_->GetKeyCode();
|
| #endif
|
| }
|
|
|
| @@ -373,13 +372,11 @@ bool Textfield::Keystroke::IsShiftHeld() const {
|
| }
|
| #else
|
| bool Textfield::Keystroke::IsControlHeld() const {
|
| - return (event_.state & gtk_accelerator_get_default_mod_mask()) ==
|
| - GDK_CONTROL_MASK;
|
| + return event_->IsControlDown();
|
| }
|
|
|
| bool Textfield::Keystroke::IsShiftHeld() const {
|
| - return (event_.state & gtk_accelerator_get_default_mod_mask()) ==
|
| - GDK_SHIFT_MASK;
|
| + return event_->IsShiftDown();
|
| }
|
| #endif
|
|
|
|
|