Re-lands 58186:

chrome/browser/chromeos/login/password_changed_view.cc

Index: chrome/browser/chromeos/login/password_changed_view.cc
diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc
index ddb36ae88ab0f7ab5283bc34371502d3443abd6c..daa290921a6e3df98d1bd4bb7b8501ef9d118d0f 100644
--- a/chrome/browser/chromeos/login/password_changed_view.cc
+++ b/chrome/browser/chromeos/login/password_changed_view.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/chromeos/login/password_changed_view.h"
 
+#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/keyboard_codes.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "grit/generated_resources.h"
@@ -162,7 +162,7 @@ void PasswordChangedView::ButtonPressed(Button* sender,
 
 bool PasswordChangedView::HandleKeystroke(views::Textfield* s,
     const views::Textfield::Keystroke& keystroke) {
-  if (keystroke.GetKeyboardCode() == base::VKEY_RETURN) {
+  if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
     ExitDialog();
     return true;
   }