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

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/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "grit/generated_resources.h"
 #include "views/controls/button/native_button.h"
@@ skipping 48 matching lines @@
                          bool need_border,
                          bool need_browse_without_signin)
     : username_field_(NULL),
       password_field_(NULL),
       title_label_(NULL),
       sign_in_button_(NULL),
       create_account_link_(NULL),
       browse_without_signin_link_(NULL),
       languages_menubutton_(NULL),
       throbber_(NULL),
-      accel_focus_user_(views::Accelerator(base::VKEY_U, false, false, true)),
-      accel_focus_pass_(views::Accelerator(base::VKEY_P, false, false, true)),
+      accel_focus_user_(views::Accelerator(app::VKEY_U, false, false, true)),
+      accel_focus_pass_(views::Accelerator(app::VKEY_P, false, false, true)),
       delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)),
       focus_delayed_(false),
       login_in_process_(false),
       need_border_(need_border),
       need_browse_without_signin_(need_browse_without_signin) {
 }
 
 NewUserView::~NewUserView() {
 }
@@ skipping 280 matching lines @@
 
 void NewUserView::StopThrobber() {
   throbber_->Stop();
 }
 
 bool NewUserView::HandleKeystroke(views::Textfield* s,
     const views::Textfield::Keystroke& keystroke) {
   if (!CrosLibrary::Get()->EnsureLoaded() || login_in_process_)
     return false;
 
-  if (keystroke.GetKeyboardCode() == base::VKEY_RETURN) {
+  if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
     Login();
     // Return true so that processing ends
     return true;
-  } else if (keystroke.GetKeyboardCode() == base::VKEY_LEFT) {
+  } else if (keystroke.GetKeyboardCode() == app::VKEY_LEFT) {
     if (s == username_field_ &&
         username_field_->text().empty() &&
         password_field_->text().empty()) {
       delegate_->NavigateAway();
       return true;
     }
   }
   delegate_->ClearErrors();
   // Return false so that processing does not end
   return false;
@@ skipping 10 matching lines @@
   }
 }
 
 void NewUserView::InitLink(views::Link** link) {
   *link = new views::Link(std::wstring());
   (*link)->SetController(this);
   AddChildView(*link);
 }
 
 }  // namespace chromeos