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

chrome/browser/chromeos/login/update_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/update_view.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 38 matching lines @@
 // Label color.
 const SkColor kLabelColor = 0xFF000000;
 const SkColor kSkipLabelColor = 0xFFAA0000;
 const SkColor kManualRebootLabelColor = 0xFFAA0000;
 
 }  // namespace
 
 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),
       progress_bar_(NULL),
       show_curtain_(true),
       show_manual_reboot_label_(false),
       observer_(observer) {
 }
 
 UpdateView::~UpdateView() {
@@ skipping 122 matching lines @@
   escape_to_skip_label_->SizeToFit(max_width);
   escape_to_skip_label_->SetX(right_margin);
   escape_to_skip_label_->SetY(kEscapeToSkipLabelY);
 #endif
   SchedulePaint();
 }
 
 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();
     }
     return true;
   }
 #endif
   return false;
 }
 
 void UpdateView::InitLabel(views::Label** label) {
@@ skipping 19 matching lines @@
   checking_label_->SetVisible(show_curtain_);
   throbber_->SetVisible(show_curtain_);
   if (show_curtain_) {
     throbber_->Start();
   } else {
     throbber_->Stop();
   }
 }
 
 }  // namespace chromeos