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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_VIEWS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_VIEWS_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_VIEWS_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_VIEWS_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/chromeos/login/captcha_view.h" 9 #include "chrome/browser/chromeos/login/captcha_view.h"
10 #include "chrome/browser/chromeos/login/message_bubble.h" 10 #include "chrome/browser/chromeos/login/message_bubble.h"
(...skipping 12 matching lines...) Expand all
23 namespace test { 23 namespace test {
24 class ScreenLockerTester; 24 class ScreenLockerTester;
25 } 25 }
26 26
27 // This version of ScreenLockerDelegate displays a views interface. This class 27 // This version of ScreenLockerDelegate displays a views interface. This class
28 // shows a BackgroundView and a Signout button as well as creating a 28 // shows a BackgroundView and a Signout button as well as creating a
29 // ScreenLockView to allow the user to log in. 29 // ScreenLockView to allow the user to log in.
30 class ScreenLockerViews : public ScreenLockerDelegate, 30 class ScreenLockerViews : public ScreenLockerDelegate,
31 public MessageBubbleDelegate, 31 public MessageBubbleDelegate,
32 public CaptchaView::Delegate, 32 public CaptchaView::Delegate,
33 public views::AcceleratorTarget { 33 public ui::AcceleratorTarget {
34 public: 34 public:
35 // Interface that helps switching from ScreenLockView to CaptchaView. 35 // Interface that helps switching from ScreenLockView to CaptchaView.
36 class ScreenLockViewContainer { 36 class ScreenLockViewContainer {
37 public: 37 public:
38 virtual void SetScreenLockView(views::View* screen_lock_view) = 0; 38 virtual void SetScreenLockView(views::View* screen_lock_view) = 0;
39 39
40 protected: 40 protected:
41 virtual ~ScreenLockViewContainer(); 41 virtual ~ScreenLockViewContainer();
42 }; 42 };
43 43
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 virtual ~ScreenLockerViews(); 83 virtual ~ScreenLockerViews();
84 84
85 // Called when the window manager is ready to handle locked state. 85 // Called when the window manager is ready to handle locked state.
86 void OnWindowManagerReady(); 86 void OnWindowManagerReady();
87 87
88 // Shows error_info_ bubble with the |message| and |arrow_location| specified. 88 // Shows error_info_ bubble with the |message| and |arrow_location| specified.
89 // Assumes that UI controls were locked before that. 89 // Assumes that UI controls were locked before that.
90 void ShowErrorBubble(const string16& message, 90 void ShowErrorBubble(const string16& message,
91 views::BubbleBorder::ArrowLocation arrow_location); 91 views::BubbleBorder::ArrowLocation arrow_location);
92 92
93 // Overridden from AcceleratorTarget: 93 // Overridden from ui::AcceleratorTarget:
94 virtual bool AcceleratorPressed(const views::Accelerator& accelerator) 94 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
95 OVERRIDE;
96 95
97 // Event handler for client-event. 96 // Event handler for client-event.
98 CHROMEGTK_CALLBACK_1(ScreenLockerViews, void, OnClientEvent, GdkEventClient*); 97 CHROMEGTK_CALLBACK_1(ScreenLockerViews, void, OnClientEvent, GdkEventClient*);
99 98
100 // The screen locker window. 99 // The screen locker window.
101 views::Widget* lock_window_; 100 views::Widget* lock_window_;
102 101
103 // Child widget to grab the keyboard/mouse input. 102 // Child widget to grab the keyboard/mouse input.
104 views::Widget* lock_widget_; 103 views::Widget* lock_widget_;
105 104
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 147
149 // True if both mouse input and keyboard input are grabbed. 148 // True if both mouse input and keyboard input are grabbed.
150 bool input_grabbed_; 149 bool input_grabbed_;
151 150
152 DISALLOW_COPY_AND_ASSIGN(ScreenLockerViews); 151 DISALLOW_COPY_AND_ASSIGN(ScreenLockerViews);
153 }; 152 };
154 153
155 } // namespace chromeos 154 } // namespace chromeos
156 155
157 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_VIEWS_H_ 156 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_VIEWS_H_
OLDNEW
« 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