Re-lands 58186:

chrome/browser/chromeos/login/user_controller.cc

Index: chrome/browser/chromeos/login/user_controller.cc
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc
index 7ac62a7a54ada9a6aa1ff02fbe6f4fb8b1b9dd26..22f0f9b4265789cbf0d4ac487af07d0ec718d0f1 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() == 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;
   }