diff options
Diffstat (limited to 'views/controls/textfield/textfield.cc')
| -rw-r--r-- | views/controls/textfield/textfield.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc index 43f0897..fc8d081 100644 --- a/views/controls/textfield/textfield.cc +++ b/views/controls/textfield/textfield.cc @@ -10,7 +10,7 @@ #include <string> -#include "base/keyboard_codes.h" +#include "app/keyboard_codes.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "gfx/insets.h" @@ -19,7 +19,7 @@ #include "views/widget/widget.h" #if defined(OS_LINUX) -#include "base/keyboard_code_conversion_gtk.h" +#include "app/keyboard_code_conversion_gtk.h" #elif defined(OS_WIN) #include "app/win_util.h" #include "base/win_util.h" @@ -239,14 +239,14 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bool reverse) { bool Textfield::SkipDefaultKeyEventProcessing(const KeyEvent& e) { // TODO(hamaji): Figure out which keyboard combinations we need to add here, // similar to LocationBarView::SkipDefaultKeyEventProcessing. - base::KeyboardCode key = e.GetKeyCode(); - if (key == base::VKEY_BACK) + app::KeyboardCode key = e.GetKeyCode(); + if (key == app::VKEY_BACK) return true; // We'll handle BackSpace ourselves. #if defined(OS_WIN) // We don't translate accelerators for ALT + NumPad digit on Windows, they are // used for entering special characters. We do translate alt-home. - if (e.IsAltDown() && (key != base::VKEY_HOME) && + if (e.IsAltDown() && (key != app::VKEY_HOME) && win_util::IsNumPadDigit(key, e.IsExtendedKey())) return true; #endif @@ -332,12 +332,12 @@ std::string Textfield::GetClassName() const { return kViewClassName; } -base::KeyboardCode Textfield::Keystroke::GetKeyboardCode() const { +app::KeyboardCode Textfield::Keystroke::GetKeyboardCode() const { #if defined(OS_WIN) - return static_cast<base::KeyboardCode>(key_); + return static_cast<app::KeyboardCode>(key_); #else - return static_cast<base::KeyboardCode>( - base::WindowsKeyCodeForGdkKeyCode(event_.keyval)); + return static_cast<app::KeyboardCode>( + app::WindowsKeyCodeForGdkKeyCode(event_.keyval)); #endif } |