Move app/key* to ui/base/keycodes/*

chrome/browser/chromeos/login/existing_user_view.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 "chrome/browser/chromeos/login/existing_user_view.h"
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/user_controller.h"
 #include "chrome/browser/chromeos/login/textfield_with_margin.h"
@@ skipping 15 matching lines @@
 // Textfield with custom processing for Tab/Shift+Tab to select entries.
 class UserEntryTextfield : public TextfieldWithMargin {
  public:
   UserEntryTextfield(UserController* controller,
                      views::Textfield::StyleFlags style)
       : TextfieldWithMargin(style),
         controller_(controller) {}
 
   // Overridden from views::View:
   virtual bool OnKeyPressed(const views::KeyEvent& e) {
-    if (e.GetKeyCode() == app::VKEY_TAB) {
+    if (e.GetKeyCode() == ui::VKEY_TAB) {
       controller_->SelectUserRelative(e.IsShiftDown() ? -1 : 1);
       return true;
-    } else if (e.GetKeyCode() == app::VKEY_LEFT) {
+    } else if (e.GetKeyCode() == ui::VKEY_LEFT) {
       controller_->SelectUserRelative(-1);
       return true;
-    } else if (e.GetKeyCode() == app::VKEY_RIGHT) {
+    } else if (e.GetKeyCode() == ui::VKEY_RIGHT) {
       controller_->SelectUserRelative(1);
       return true;
     } else {
       return false;
     }
   }
 
   virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
-    if (e.GetKeyCode() == app::VKEY_TAB)
+    if (e.GetKeyCode() == ui::VKEY_TAB)
       return true;
     else
       return views::Textfield::SkipDefaultKeyEventProcessing(e);
   }
 
  private:
   UserController* controller_;
 
   DISALLOW_COPY_AND_ASSIGN(UserEntryTextfield);
 };
 
 
 ExistingUserView::ExistingUserView(UserController* user_controller)
     : user_controller_(user_controller),
       password_field_(NULL),
       accel_login_off_the_record_(
-        views::Accelerator(app::VKEY_B, false, false, true)),
+        views::Accelerator(ui::VKEY_B, false, false, true)),
       accel_toggle_accessibility_(
           WizardAccessibilityHelper::GetAccelerator()) {
   AddAccelerator(accel_login_off_the_record_);
   AddAccelerator(accel_toggle_accessibility_);
 }
 
 void ExistingUserView::RecreateFields() {
   if (password_field_ == NULL) {
     SetLayoutManager(new views::FillLayout);
     password_field_ = new UserEntryTextfield(user_controller_,
@@ skipping 18 matching lines @@
     return true;
   } else if (accelerator == accel_toggle_accessibility_) {
     WizardAccessibilityHelper::GetInstance()->ToggleAccessibility(this);
     return true;
   }
   return false;
 }
 
 bool ExistingUserView::HandleKeyEvent(views::Textfield* sender,
                                       const views::KeyEvent& key_event) {
-  if (key_event.GetKeyCode() == app::VKEY_RETURN) {
+  if (key_event.GetKeyCode() == ui::VKEY_RETURN) {
     if (!password_field_->text().empty())
       user_controller_->OnLogin("", UTF16ToUTF8(password_field_->text()));
   } else {
     user_controller_->ClearErrors();
     return false;
   }
   return true;
 }
 
 void ExistingUserView::ContentsChanged(views::Textfield* sender,
@@ skipping 26 matching lines @@
 
 gfx::Rect ExistingUserView::GetMainInputScreenBounds() const {
   return password_field_->GetScreenBounds();
 }
 
 void ExistingUserView::OnLocaleChanged() {
   RecreateFields();
 }
 
 }  // namespace chromeos