Re-lands 58186:

chrome/browser/chromeos/login/user_controller.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/user_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 196 matching lines @@
 }
 
 void UserController::ButtonPressed(views::Button* sender,
                                    const views::Event& event) {
   Login();
 }
 
 bool UserController::HandleKeystroke(
     views::Textfield* sender,
     const views::Textfield::Keystroke& keystroke) {
-  if (keystroke.GetKeyboardCode() == base::VKEY_RETURN) {
+  if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
     Login();
     return true;
-  } else if (keystroke.GetKeyboardCode() == base::VKEY_LEFT) {
+  } else if (keystroke.GetKeyboardCode() == app::VKEY_LEFT) {
     SelectUser(user_index() - 1);
     return true;
-  } else if (keystroke.GetKeyboardCode() == base::VKEY_RIGHT) {
+  } else if (keystroke.GetKeyboardCode() == app::VKEY_RIGHT) {
     SelectUser(user_index() + 1);
     return true;
   }
   delegate_->ClearErrors();
   return false;
 }
 
 void UserController::Observe(
     NotificationType type,
     const NotificationSource& source,
@@ skipping 210 matching lines @@
 
 void UserController::SelectUser(int index) {
   delegate_->SelectUser(index);
 }
 
 void UserController::FocusPasswordField() {
   existing_user_view_->password_field()->RequestFocus();
 }
 
 }  // namespace chromeos