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

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

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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/screen_locker_views.cc
diff --git a/chrome/browser/chromeos/login/screen_locker_views.cc b/chrome/browser/chromeos/login/screen_locker_views.cc
index ed5657d69c1bfea90046f6be1100b129ba3c5720..dd4d4fa674bd917df4bae3da43dc5f7f8451cc10 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.cc
+++ b/chrome/browser/chromeos/login/screen_locker_views.cc
@@ -747,7 +747,7 @@ void ScreenLockerViews::ScreenLockReady() {
if (background_view_->ScreenSaverEnabled()) {
lock_widget_->GetFocusManager()->RegisterAccelerator(
- views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+ ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
locker_input_event_observer_.reset(new LockerInputEventObserver(this));
MessageLoopForUI::current()->AddObserver(
locker_input_event_observer_.get());
@@ -861,7 +861,7 @@ ScreenLockerViews::~ScreenLockerViews() {
MessageLoopForUI::current()->RemoveObserver(input_event_observer_.get());
if (locker_input_event_observer_.get()) {
lock_widget_->GetFocusManager()->UnregisterAccelerator(
- views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+ ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
MessageLoopForUI::current()->RemoveObserver(
locker_input_event_observer_.get());
}
@@ -913,7 +913,7 @@ void ScreenLockerViews::ShowErrorBubble(
}
bool ScreenLockerViews::AcceleratorPressed(
- const views::Accelerator& accelerator) {
+ const ui::Accelerator& accelerator) {
if (!background_view_->IsScreenSaverVisible()) {
screen_locker_view_->StartScreenSaver();
return true;
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker_views.h ('k') | chrome/browser/chromeos/login/webui_login_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698