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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 3337006: Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas... (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
« no previous file with comments | « chrome/browser/chromeos/login/screen_lock_view.cc ('k') | chrome/browser/chromeos/login/screen_locker_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screen_locker.cc
===================================================================
--- chrome/browser/chromeos/login/screen_locker.cc (revision 58389)
+++ chrome/browser/chromeos/login/screen_locker.cc (working copy)
@@ -718,7 +718,7 @@
MessageLoopForUI::current()->RemoveObserver(input_event_observer_.get());
if (locker_input_event_observer_.get()) {
lock_widget_->GetFocusManager()->UnregisterAccelerator(
- views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
+ views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
MessageLoopForUI::current()->RemoveObserver(
locker_input_event_observer_.get());
}
@@ -750,7 +750,7 @@
lock_widget_->GetRootView()->SetVisible(true);
if (background_view_->ScreenSaverEnabled()) {
lock_widget_->GetFocusManager()->RegisterAccelerator(
- views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
+ views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
locker_input_event_observer_.reset(new LockerInputEventObserver(this));
MessageLoopForUI::current()->AddObserver(
locker_input_event_observer_.get());
« no previous file with comments | « chrome/browser/chromeos/login/screen_lock_view.cc ('k') | chrome/browser/chromeos/login/screen_locker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698