Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1030)

Unified Diff: chrome/browser/chromeos/login/update_view.cc

Issue 3361003: Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/update_view.cc
===================================================================
--- chrome/browser/chromeos/login/update_view.cc (revision 58386)
+++ chrome/browser/chromeos/login/update_view.cc (working copy)
@@ -56,7 +56,7 @@
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 @@
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();
}
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker_browsertest.cc ('k') | chrome/browser/chromeos/login/user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698