Revert 58186 - Move the keyboard files from base/ to app/.

Also moves the associated classes/enums from base:: to app::.

TEST=try bots compile
BUG=NONE

Review URL: http://codereview.chromium.org/3165064

TBR=bryeung@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 31 insertions, 31 deletions

diff --git a/chrome/renderer/password_autocomplete_manager.cc b/chrome/renderer/password_autocomplete_manager.cc
index c460db4..b74d357 100644
--- a/chrome/renderer/password_autocomplete_manager.cc
+++ b/chrome/renderer/password_autocomplete_manager.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/renderer/password_autocomplete_manager.h"
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/render_messages.h"
@@ -302,7 +302,7 @@ void PasswordAutocompleteManager::TextFieldHandlingKeyDown(
 
   int win_key_code = event.windowsKeyCode;
   iter->second.backspace_pressed_last =
-      (win_key_code == app::VKEY_BACK || win_key_code == app::VKEY_DELETE);
+      (win_key_code == base::VKEY_BACK || win_key_code == base::VKEY_DELETE);
 }
 
 bool PasswordAutocompleteManager::InputElementClicked(
diff --git a/chrome/renderer/password_autocomplete_manager_unittest.cc b/chrome/renderer/password_autocomplete_manager_unittest.cc
index 8b1f451..a799365 100644
--- a/chrome/renderer/password_autocomplete_manager_unittest.cc
+++ b/chrome/renderer/password_autocomplete_manager_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/renderer/password_autocomplete_manager.h"
@@ -116,7 +116,7 @@ class PasswordAutocompleteManagerTest : public RenderViewTest {
   }
 
   void SimulateKeyDownEvent(const WebInputElement& element,
-                            app::KeyboardCode key_code) {
+                            base::KeyboardCode key_code) {
     WebKit::WebKeyboardEvent key_event;
     key_event.windowsKeyCode = key_code;
     view_->textFieldDidReceiveKeyDown(element, key_event);
@@ -288,12 +288,12 @@ TEST_F(PasswordAutocompleteManagerTest, MAYBE_InlineAutocomplete) {
   CheckUsernameSelection(2, 5);
 
   // Test that deleting does not trigger autocomplete.
-  SimulateKeyDownEvent(username_element_, app::VKEY_BACK);
+  SimulateKeyDownEvent(username_element_, base::VKEY_BACK);
   SimulateUsernameChange("alic", true);
   CheckTextFieldsState("alic", false, "", false);
   CheckUsernameSelection(4, 4);  // No selection.
   // Reset the last pressed key to something other than backspace.
-  SimulateKeyDownEvent(username_element_, app::VKEY_A);
+  SimulateKeyDownEvent(username_element_, base::VKEY_A);
 
   // Now lets say the user goes astray from the stored username and types the
   // letter 'f', spelling 'alf'.  We don't know alf (that's just sad), so in
diff --git a/chrome/renderer/render_view_browsertest.cc b/chrome/renderer/render_view_browsertest.cc
index 531aae7..35cdb6d 100644
--- a/chrome/renderer/render_view_browsertest.cc
+++ b/chrome/renderer/render_view_browsertest.cc
@@ -4,8 +4,8 @@
 
 #include "base/basictypes.h"
 
-#include "app/keyboard_codes.h"
 #include "base/file_util.h"
+#include "base/keyboard_codes.h"
 #include "base/shared_memory.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/content_settings.h"
@@ -578,20 +578,20 @@ TEST_F(RenderViewTest, OnHandleKeyboardEvent) {
         'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
         'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
         'W', 'X', 'Y', 'Z',
-        app::VKEY_OEM_1,
-        app::VKEY_OEM_PLUS,
-        app::VKEY_OEM_COMMA,
-        app::VKEY_OEM_MINUS,
-        app::VKEY_OEM_PERIOD,
-        app::VKEY_OEM_2,
-        app::VKEY_OEM_3,
-        app::VKEY_OEM_4,
-        app::VKEY_OEM_5,
-        app::VKEY_OEM_6,
-        app::VKEY_OEM_7,
+        base::VKEY_OEM_1,
+        base::VKEY_OEM_PLUS,
+        base::VKEY_OEM_COMMA,
+        base::VKEY_OEM_MINUS,
+        base::VKEY_OEM_PERIOD,
+        base::VKEY_OEM_2,
+        base::VKEY_OEM_3,
+        base::VKEY_OEM_4,
+        base::VKEY_OEM_5,
+        base::VKEY_OEM_6,
+        base::VKEY_OEM_7,
 #if defined(OS_WIN)
         // Not sure how to handle this key on Linux.
-        app::VKEY_OEM_8,
+        base::VKEY_OEM_8,
 #endif
       };
 
@@ -817,20 +817,20 @@ TEST_F(RenderViewTest, InsertCharacters) {
         'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
         'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
         'W', 'X', 'Y', 'Z',
-        app::VKEY_OEM_1,
-        app::VKEY_OEM_PLUS,
-        app::VKEY_OEM_COMMA,
-        app::VKEY_OEM_MINUS,
-        app::VKEY_OEM_PERIOD,
-        app::VKEY_OEM_2,
-        app::VKEY_OEM_3,
-        app::VKEY_OEM_4,
-        app::VKEY_OEM_5,
-        app::VKEY_OEM_6,
-        app::VKEY_OEM_7,
+        base::VKEY_OEM_1,
+        base::VKEY_OEM_PLUS,
+        base::VKEY_OEM_COMMA,
+        base::VKEY_OEM_MINUS,
+        base::VKEY_OEM_PERIOD,
+        base::VKEY_OEM_2,
+        base::VKEY_OEM_3,
+        base::VKEY_OEM_4,
+        base::VKEY_OEM_5,
+        base::VKEY_OEM_6,
+        base::VKEY_OEM_7,
 #if defined(OS_WIN)
         // Unclear how to handle this on Linux.
-        app::VKEY_OEM_8,
+        base::VKEY_OEM_8,
 #endif
       };