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

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

Issue 3165064: Move the keyboard files from base/ to app/. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: latest merge 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
diff --git a/chrome/browser/chromeos/login/update_view.cc b/chrome/browser/chromeos/login/update_view.cc
index 9a382f54da39da63c33082478332692aac635060..13b86df1d60ec9c132b29eb6c63cfb76fd696936 100644
--- a/chrome/browser/chromeos/login/update_view.cc
+++ b/chrome/browser/chromeos/login/update_view.cc
@@ -52,7 +52,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),
@@ -156,7 +156,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();
}
« 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