summaryrefslogtreecommitdiffstats
path: root/views/controls/textfield
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/textfield')
-rw-r--r--views/controls/textfield/native_textfield_win.cc10
-rw-r--r--views/controls/textfield/textfield.cc18
-rw-r--r--views/controls/textfield/textfield.h4
3 files changed, 16 insertions, 16 deletions
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index c91dcdf..fc4ad8b 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -8,11 +8,11 @@
#include "app/clipboard/clipboard.h"
#include "app/clipboard/scoped_clipboard_writer.h"
-#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
#include "app/win_util.h"
#include "base/i18n/rtl.h"
+#include "base/keyboard_codes.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/win_util.h"
@@ -313,13 +313,13 @@ bool NativeTextfieldWin::GetAcceleratorForCommandId(int command_id,
// anywhere so we need to check for them explicitly here.
switch (command_id) {
case IDS_APP_CUT:
- *accelerator = views::Accelerator(app::VKEY_X, false, true, false);
+ *accelerator = views::Accelerator(base::VKEY_X, false, true, false);
return true;
case IDS_APP_COPY:
- *accelerator = views::Accelerator(app::VKEY_C, false, true, false);
+ *accelerator = views::Accelerator(base::VKEY_C, false, true, false);
return true;
case IDS_APP_PASTE:
- *accelerator = views::Accelerator(app::VKEY_V, false, true, false);
+ *accelerator = views::Accelerator(base::VKEY_V, false, true, false);
return true;
}
return container_view_->GetWidget()->GetAccelerator(command_id, accelerator);
@@ -868,7 +868,7 @@ void NativeTextfieldWin::HandleKeystroke(UINT message,
if (!handled) {
OnBeforePossibleChange();
- if (key == app::VKEY_HOME || key == app::VKEY_END) {
+ if (key == base::VKEY_HOME || key == base::VKEY_END) {
// DefWindowProc() might reset the keyboard layout when it receives a
// keydown event for VKEY_HOME or VKEY_END. When the window was created
// with WS_EX_LAYOUTRTL and the current keyboard layout is not a RTL one,
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index fc8d081..43f0897 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -10,7 +10,7 @@
#include <string>
-#include "app/keyboard_codes.h"
+#include "base/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 "app/keyboard_code_conversion_gtk.h"
+#include "base/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.
- app::KeyboardCode key = e.GetKeyCode();
- if (key == app::VKEY_BACK)
+ base::KeyboardCode key = e.GetKeyCode();
+ if (key == base::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 != app::VKEY_HOME) &&
+ if (e.IsAltDown() && (key != base::VKEY_HOME) &&
win_util::IsNumPadDigit(key, e.IsExtendedKey()))
return true;
#endif
@@ -332,12 +332,12 @@ std::string Textfield::GetClassName() const {
return kViewClassName;
}
-app::KeyboardCode Textfield::Keystroke::GetKeyboardCode() const {
+base::KeyboardCode Textfield::Keystroke::GetKeyboardCode() const {
#if defined(OS_WIN)
- return static_cast<app::KeyboardCode>(key_);
+ return static_cast<base::KeyboardCode>(key_);
#else
- return static_cast<app::KeyboardCode>(
- app::WindowsKeyCodeForGdkKeyCode(event_.keyval));
+ return static_cast<base::KeyboardCode>(
+ base::WindowsKeyCodeForGdkKeyCode(event_.keyval));
#endif
}
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 3bd6c31..564243e 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -14,8 +14,8 @@
#include <string>
-#include "app/keyboard_codes.h"
#include "base/basictypes.h"
+#include "base/keyboard_codes.h"
#if !defined(OS_LINUX)
#include "base/logging.h"
#endif
@@ -65,7 +65,7 @@ class Textfield : public View {
}
const GdkEventKey* event() const { return &event_; }
#endif
- app::KeyboardCode GetKeyboardCode() const;
+ base::KeyboardCode GetKeyboardCode() const;
bool IsControlHeld() const;
bool IsShiftHeld() const;