Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

chrome/browser/chromeos/login/password_changed_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/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"
 #include "grit/locale_settings.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/label.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/window/window.h"
 
@@ skipping 135 matching lines @@
     old_password_field_->SetEnabled(false);
     old_password_field_->SetText(string16());
   } else if (sender == delta_sync_radio_) {
     old_password_field_->SetEnabled(true);
     old_password_field_->RequestFocus();
   }
 }
 
 bool PasswordChangedView::HandleKeystroke(views::Textfield* s,
     const views::Textfield::Keystroke& keystroke) {
-  if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
+  if (keystroke.GetKeyboardCode() == base::VKEY_RETURN) {
     ExitDialog();
     return true;
   }
 
   return false;
 }
 
 void PasswordChangedView::SelectDeltaSyncOption() {
   if (!delta_sync_radio_->checked())
     delta_sync_radio_->SetChecked(true);
 }
 
 }  // namespace chromeos