Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

views/controls/textfield/textfield.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/textfield/textfield.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdkkeysyms.h>
 #endif
 
 #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"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #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"
 // TODO(beng): this should be removed when the OS_WIN hack from
 // ViewHierarchyChanged is removed.
 #include "views/controls/textfield/native_textfield_win.h"
 #endif
 
 namespace views {
 
@@ skipping 199 matching lines @@
   return IsEnabled() && !read_only_;
 }
 
 void Textfield::AboutToRequestFocusFromTabTraversal(bool reverse) {
   SelectAll();
 }
 
 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
   return false;
 }
 
 void Textfield::PaintFocusBorder(gfx::Canvas* canvas) {
   if (NativeViewHost::kRenderNativeControlFocus)
     View::PaintFocusBorder(canvas);
 }
@@ skipping 65 matching lines @@
     // Remove the include for native_textfield_win.h above when you fix this.
     static_cast<NativeTextfieldWin*>(native_wrapper_)->AttachHack();
 #endif
   }
 }
 
 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
 }
 
 #if defined(OS_WIN)
 bool Textfield::Keystroke::IsControlHeld() const {
   return win_util::IsCtrlPressed();
 }
 
 bool Textfield::Keystroke::IsShiftHeld() const {
   return win_util::IsShiftPressed();
 }
 #else
 bool Textfield::Keystroke::IsControlHeld() const {
   return (event_.state & gtk_accelerator_get_default_mod_mask()) ==
       GDK_CONTROL_MASK;
 }
 
 bool Textfield::Keystroke::IsShiftHeld() const {
   return (event_.state & gtk_accelerator_get_default_mod_mask()) ==
       GDK_SHIFT_MASK;
 }
 #endif
 
 }  // namespace views