Revert 58388 - Revert 58215 - 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

TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3361003

TBR=bryeung@chromium.org
Review URL: http://codereview.chromium.org/3337006

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

11 files changed, 33 insertions, 33 deletions

diff --git a/chrome/browser/chromeos/login/existing_user_view.cc b/chrome/browser/chromeos/login/existing_user_view.cc
index eaadb11..45c4176 100644
--- a/chrome/browser/chromeos/login/existing_user_view.cc
+++ b/chrome/browser/chromeos/login/existing_user_view.cc
@@ -45,7 +45,7 @@ class UserEntryTextfield : public views::Textfield {
 
   // Overridden from View:
   virtual bool OnKeyPressed(const views::KeyEvent& e) {
-    if (e.GetKeyCode() == app::VKEY_TAB) {
+    if (e.GetKeyCode() == base::VKEY_TAB) {
       int index = controller_->user_index() + (e.IsShiftDown() ? -1 : 1);
       controller_->SelectUser(index);
       return true;
@@ -56,7 +56,7 @@ class UserEntryTextfield : public views::Textfield {
 
   // Overridden from views::Textfield:
   virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
-    if (e.GetKeyCode() == app::VKEY_TAB)
+    if (e.GetKeyCode() == base::VKEY_TAB)
       return true;
     else
       return views::Textfield::SkipDefaultKeyEventProcessing(e);
diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc
index ea8a563..e727f70 100644
--- a/chrome/browser/chromeos/login/new_user_view.cc
+++ b/chrome/browser/chromeos/login/new_user_view.cc
@@ -10,11 +10,11 @@
 #include <algorithm>
 #include <vector>
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/command_line.h"
+#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
@@ -83,8 +83,8 @@ NewUserView::NewUserView(Delegate* delegate,
       browse_without_signin_link_(NULL),
       languages_menubutton_(NULL),
       throbber_(NULL),
-      accel_focus_user_(views::Accelerator(app::VKEY_U, false, false, true)),
-      accel_focus_pass_(views::Accelerator(app::VKEY_P, false, false, true)),
+      accel_focus_user_(views::Accelerator(base::VKEY_U, false, false, true)),
+      accel_focus_pass_(views::Accelerator(base::VKEY_P, false, false, true)),
       delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)),
       focus_delayed_(false),
@@ -385,11 +385,11 @@ bool NewUserView::HandleKeystroke(views::Textfield* s,
   if (!CrosLibrary::Get()->EnsureLoaded() || login_in_process_)
     return false;
 
-  if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
+  if (keystroke.GetKeyboardCode() == base::VKEY_RETURN) {
     Login();
     // Return true so that processing ends
     return true;
-  } else if (keystroke.GetKeyboardCode() == app::VKEY_LEFT) {
+  } else if (keystroke.GetKeyboardCode() == base::VKEY_LEFT) {
     if (s == username_field_ &&
         username_field_->text().empty() &&
         password_field_->text().empty()) {
diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc
index daa2909..ddb36ae 100644
--- a/chrome/browser/chromeos/login/password_changed_view.cc
+++ b/chrome/browser/chromeos/login/password_changed_view.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/chromeos/login/password_changed_view.h"
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/keyboard_codes.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "grit/generated_resources.h"
@@ -162,7 +162,7 @@ void PasswordChangedView::ButtonPressed(Button* sender,
 
 bool PasswordChangedView::HandleKeystroke(views::Textfield* s,
     const views::Textfield::Keystroke& keystroke) {
-  if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
+  if (keystroke.GetKeyboardCode() == base::VKEY_RETURN) {
     ExitDialog();
     return true;
   }
diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc
index 3906560..3e19bc6 100644
--- a/chrome/browser/chromeos/login/screen_lock_view.cc
+++ b/chrome/browser/chromeos/login/screen_lock_view.cc
@@ -202,7 +202,7 @@ bool ScreenLockView::HandleKeystroke(
     views::Textfield* sender,
     const views::Textfield::Keystroke& keystroke) {
   screen_locker_->ClearErrors();
-  if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
+  if (keystroke.GetKeyboardCode() == base::VKEY_RETURN) {
     screen_locker_->Authenticate(password_field_->text());
     return true;
   }
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 85cc6bd..9a2038c 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -718,7 +718,7 @@ ScreenLocker::~ScreenLocker() {
     MessageLoopForUI::current()->RemoveObserver(input_event_observer_.get());
   if (locker_input_event_observer_.get()) {
     lock_widget_->GetFocusManager()->UnregisterAccelerator(
-        views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
+        views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
     MessageLoopForUI::current()->RemoveObserver(
         locker_input_event_observer_.get());
   }
@@ -750,7 +750,7 @@ void ScreenLocker::ScreenLockReady() {
   lock_widget_->GetRootView()->SetVisible(true);
   if (background_view_->ScreenSaverEnabled()) {
     lock_widget_->GetFocusManager()->RegisterAccelerator(
-        views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
+        views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
     locker_input_event_observer_.reset(new LockerInputEventObserver(this));
     MessageLoopForUI::current()->AddObserver(
         locker_input_event_observer_.get());
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index f9fa9f4..5706e4d 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -246,7 +246,7 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestNoPasswordWithMouseClick) {
 
 void KeyPress(views::Widget* widget) {
   ui_controls::SendKeyPress(GTK_WINDOW(widget->GetNativeView()),
-                            app::VKEY_SPACE, false, false, false, false);
+                            base::VKEY_SPACE, false, false, false, false);
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestNoPasswordWithKeyPress) {
diff --git a/chrome/browser/chromeos/login/update_view.cc b/chrome/browser/chromeos/login/update_view.cc
index e99d13d..b99f4af 100644
--- a/chrome/browser/chromeos/login/update_view.cc
+++ b/chrome/browser/chromeos/login/update_view.cc
@@ -56,7 +56,7 @@ const SkColor kManualRebootLabelColor = 0xFFAA0000;
 namespace chromeos {
 
 UpdateView::UpdateView(chromeos::ScreenObserver* observer)
-    : escape_accelerator_(app::VKEY_ESCAPE, false, false, false),
+    : escape_accelerator_(base::VKEY_ESCAPE, false, false, false),
       installing_updates_label_(NULL),
       reboot_label_(NULL),
       manual_reboot_label_(NULL),
@@ -199,7 +199,7 @@ void UpdateView::Layout() {
 bool UpdateView::AcceleratorPressed(const views::Accelerator& a) {
 #if !defined(OFFICIAL_BUILD)
   RemoveAccelerator(escape_accelerator_);
-  if (a.GetKeyCode() == app::VKEY_ESCAPE) {
+  if (a.GetKeyCode() == base::VKEY_ESCAPE) {
     if (controller_ != NULL) {
       controller_->CancelUpdate();
     }
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc
index 22f0f9b..7ac62a7 100644
--- a/chrome/browser/chromeos/login/user_controller.cc
+++ b/chrome/browser/chromeos/login/user_controller.cc
@@ -214,13 +214,13 @@ void UserController::ButtonPressed(views::Button* sender,
 bool UserController::HandleKeystroke(
     views::Textfield* sender,
     const views::Textfield::Keystroke& keystroke) {
-  if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
+  if (keystroke.GetKeyboardCode() == base::VKEY_RETURN) {
     Login();
     return true;
-  } else if (keystroke.GetKeyboardCode() == app::VKEY_LEFT) {
+  } else if (keystroke.GetKeyboardCode() == base::VKEY_LEFT) {
     SelectUser(user_index() - 1);
     return true;
-  } else if (keystroke.GetKeyboardCode() == app::VKEY_RIGHT) {
+  } else if (keystroke.GetKeyboardCode() == base::VKEY_RIGHT) {
     SelectUser(user_index() + 1);
     return true;
   }
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.h b/chrome/browser/chromeos/login/wizard_accessibility_helper.h
index 5f4d370..fa411ca 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.h
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_ACCESSIBILITY_HELPER_H_
 #pragma once
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_handler.h"
@@ -34,7 +34,7 @@ class WizardAccessibilityHelper {
   void MaybeEnableAccessibility(views::View* view_tree, Profile* profile);
 
   // Keyboard accelerator key to enable accessibility.
-  static const app::KeyboardCode accelerator = app::VKEY_Z;
+  static const base::KeyboardCode accelerator = base::VKEY_Z;
 
  private:
   friend struct DefaultSingletonTraits<WizardAccessibilityHelper>;
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index d8f40b1..82faecd 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -86,19 +86,19 @@ class ContentView : public views::View {
         window_y_(window_y),
         screen_w_(screen_w),
         screen_h_(screen_h),
-        accel_account_screen_(views::Accelerator(app::VKEY_A,
+        accel_account_screen_(views::Accelerator(base::VKEY_A,
                                                  false, true, true)),
-        accel_login_screen_(views::Accelerator(app::VKEY_L,
+        accel_login_screen_(views::Accelerator(base::VKEY_L,
                                                false, true, true)),
-        accel_network_screen_(views::Accelerator(app::VKEY_N,
+        accel_network_screen_(views::Accelerator(base::VKEY_N,
                                                  false, true, true)),
-        accel_update_screen_(views::Accelerator(app::VKEY_U,
+        accel_update_screen_(views::Accelerator(base::VKEY_U,
                                                 false, true, true)),
-        accel_image_screen_(views::Accelerator(app::VKEY_I,
+        accel_image_screen_(views::Accelerator(base::VKEY_I,
                                                false, true, true)),
-        accel_eula_screen_(views::Accelerator(app::VKEY_E,
+        accel_eula_screen_(views::Accelerator(base::VKEY_E,
                                               false, true, true)),
-        accel_register_screen_(views::Accelerator(app::VKEY_R,
+        accel_register_screen_(views::Accelerator(base::VKEY_R,
                                                   false, true, true)),
         accel_enable_accessibility_(views::Accelerator(
             WizardAccessibilityHelper::accelerator, false, true, true)) {
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 67d4fde..1fa0261 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -203,12 +203,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, Accelerators) {
 
   views::FocusManager* focus_manager =
       controller()->contents()->GetFocusManager();
-  views::Accelerator accel_account_screen(app::VKEY_A, false, true, true);
-  views::Accelerator accel_login_screen(app::VKEY_L, false, true, true);
-  views::Accelerator accel_network_screen(app::VKEY_N, false, true, true);
-  views::Accelerator accel_update_screen(app::VKEY_U, false, true, true);
-  views::Accelerator accel_image_screen(app::VKEY_I, false, true, true);
-  views::Accelerator accel_eula_screen(app::VKEY_E, false, true, true);
+  views::Accelerator accel_account_screen(base::VKEY_A, false, true, true);
+  views::Accelerator accel_login_screen(base::VKEY_L, false, true, true);
+  views::Accelerator accel_network_screen(base::VKEY_N, false, true, true);
+  views::Accelerator accel_update_screen(base::VKEY_U, false, true, true);
+  views::Accelerator accel_image_screen(base::VKEY_I, false, true, true);
+  views::Accelerator accel_eula_screen(base::VKEY_E, false, true, true);
 
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
   EXPECT_CALL(*mock_account_screen_, Show()).Times(1);