Re-lands 58186:

chrome/browser/chromeos/login/update_view.cc

Index: chrome/browser/chromeos/login/update_view.cc
diff --git a/chrome/browser/chromeos/login/update_view.cc b/chrome/browser/chromeos/login/update_view.cc
index b99f4afbcebf64d091338773a752e732c102af18..e99d13d2c2b0a1690b2094e3cb91533d99ab6b1e 100644
--- a/chrome/browser/chromeos/login/update_view.cc
+++ b/chrome/browser/chromeos/login/update_view.cc
@@ -56,7 +56,7 @@ const SkColor kManualRebootLabelColor = 0xFFAA0000;
 namespace chromeos {
 
 UpdateView::UpdateView(chromeos::ScreenObserver* observer)
-    : escape_accelerator_(base::VKEY_ESCAPE, false, false, false),
+    : escape_accelerator_(app::VKEY_ESCAPE, false, false, false),
       installing_updates_label_(NULL),
       reboot_label_(NULL),
       manual_reboot_label_(NULL),
@@ -199,7 +199,7 @@ void UpdateView::Layout() {
 bool UpdateView::AcceleratorPressed(const views::Accelerator& a) {
 #if !defined(OFFICIAL_BUILD)
   RemoveAccelerator(escape_accelerator_);
-  if (a.GetKeyCode() == base::VKEY_ESCAPE) {
+  if (a.GetKeyCode() == app::VKEY_ESCAPE) {
     if (controller_ != NULL) {
       controller_->CancelUpdate();
     }