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

chrome/browser/chromeos/login/new_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/new_user_view.h"
 
 #include <signal.h>
 #include <sys/types.h>
 
 #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/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/textfield_with_margin.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/views/copy_background.h"
 #include "gfx/font.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/widget/widget_gtk.h"
 
 using views::View;
 
 namespace {
 
 const int kTextfieldWidth = 230;
 const int kSplitterHeight = 1;
@@ skipping 32 matching lines @@
         was_trim = false;
       }
     }
 
     if (was_trim)
       SetText(user_input);
   }
 
   // Overridden from views::View:
   virtual bool OnKeyPressed(const views::KeyEvent& e) {
-    if (e.GetKeyCode() == app::VKEY_LEFT) {
+    if (e.GetKeyCode() == ui::VKEY_LEFT) {
       return controller_->NavigateAway();
     }
     return false;
   }
 
  private:
   chromeos::NewUserView* controller_;
   DISALLOW_COPY_AND_ASSIGN(UsernameField);
 };
 
 }  // namespace
 
 namespace chromeos {
 
 NewUserView::NewUserView(Delegate* delegate,
                          bool need_border,
                          bool need_guest_link)
     : username_field_(NULL),
       password_field_(NULL),
       title_label_(NULL),
       title_hint_label_(NULL),
       splitter_up1_(NULL),
       splitter_up2_(NULL),
       splitter_down1_(NULL),
       splitter_down2_(NULL),
       sign_in_button_(NULL),
       create_account_link_(NULL),
       guest_link_(NULL),
       languages_menubutton_(NULL),
-      accel_focus_pass_(views::Accelerator(app::VKEY_P, false, false, true)),
-      accel_focus_user_(views::Accelerator(app::VKEY_U, false, false, true)),
+      accel_focus_pass_(views::Accelerator(ui::VKEY_P, false, false, true)),
+      accel_focus_user_(views::Accelerator(ui::VKEY_U, false, false, true)),
       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()),
       delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)),
       focus_delayed_(false),
       login_in_process_(false),
       need_border_(need_border),
       need_guest_link_(false),
       need_create_account_(false),
       languages_menubutton_order_(-1),
       sign_in_button_order_(-1) {
@@ skipping 395 matching lines @@
 
 gfx::Rect NewUserView::GetUsernameBounds() const {
   return username_field_->GetScreenBounds();
 }
 
 bool NewUserView::HandleKeyEvent(views::Textfield* sender,
                                  const views::KeyEvent& key_event) {
   if (!CrosLibrary::Get()->EnsureLoaded() || login_in_process_)
     return false;
 
-  if (key_event.GetKeyCode() == app::VKEY_RETURN) {
+  if (key_event.GetKeyCode() == ui::VKEY_RETURN) {
     if (!username_field_->text().empty() && !password_field_->text().empty())
       Login();
     // Return true so that processing ends
     return true;
   }
   delegate_->ClearErrors();
   // Return false so that processing does not end
   return false;
 }
 
@@ skipping 27 matching lines @@
 
 void NewUserView::InitLink(views::Link** link) {
   *link = new views::Link(std::wstring());
   (*link)->SetController(this);
   (*link)->SetNormalColor(login::kLinkColor);
   (*link)->SetHighlightedColor(login::kLinkColor);
   AddChildView(*link);
 }
 
 }  // namespace chromeos