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

chrome/browser/chromeos/login/update_view.cc

Index: chrome/browser/chromeos/login/update_view.cc
===================================================================
--- chrome/browser/chromeos/login/update_view.cc	(revision 58389)
+++ chrome/browser/chromeos/login/update_view.cc	(working copy)
@@ -56,7 +56,7 @@
 namespace chromeos {
 
 UpdateView::UpdateView(chromeos::ScreenObserver* observer)
-    : escape_accelerator_(app::VKEY_ESCAPE, false, false, false),
+    : escape_accelerator_(base::VKEY_ESCAPE, false, false, false),
       installing_updates_label_(NULL),
       reboot_label_(NULL),
       manual_reboot_label_(NULL),
@@ -199,7 +199,7 @@
 bool UpdateView::AcceleratorPressed(const views::Accelerator& a) {
 #if !defined(OFFICIAL_BUILD)
   RemoveAccelerator(escape_accelerator_);
-  if (a.GetKeyCode() == app::VKEY_ESCAPE) {
+  if (a.GetKeyCode() == base::VKEY_ESCAPE) {
     if (controller_ != NULL) {
       controller_->CancelUpdate();
     }