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

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

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
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.h ('k') | chrome/browser/chromeos/login/screen_locker_views.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_views.h
diff --git a/chrome/browser/chromeos/login/screen_locker_views.h b/chrome/browser/chromeos/login/screen_locker_views.h
index db95a5cac37285ae5986be02740b501535355c59..aa6eef8e6c05714eb45dfe06bca06a98d465da25 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.h
+++ b/chrome/browser/chromeos/login/screen_locker_views.h
@@ -30,7 +30,7 @@ class ScreenLockerTester;
class ScreenLockerViews : public ScreenLockerDelegate,
public MessageBubbleDelegate,
public CaptchaView::Delegate,
- public views::AcceleratorTarget {
+ public ui::AcceleratorTarget {
public:
// Interface that helps switching from ScreenLockView to CaptchaView.
class ScreenLockViewContainer {
@@ -90,9 +90,8 @@ class ScreenLockerViews : public ScreenLockerDelegate,
void ShowErrorBubble(const string16& message,
views::BubbleBorder::ArrowLocation arrow_location);
- // Overridden from AcceleratorTarget:
- virtual bool AcceleratorPressed(const views::Accelerator& accelerator)
- OVERRIDE;
+ // Overridden from ui::AcceleratorTarget:
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
// Event handler for client-event.
CHROMEGTK_CALLBACK_1(ScreenLockerViews, void, OnClientEvent, GdkEventClient*);
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.h ('k') | chrome/browser/chromeos/login/screen_locker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698