OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_LOCK_WEBUI_SCREEN_LOCKER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ |
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/shell_delegate.h" | 10 #include "ash/shell_delegate.h" |
11 #include "ash/wm/lock_state_observer.h" | 11 #include "ash/wm/lock_state_observer.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
15 #include "base/time/time.h" | 15 #include "base/time/time.h" |
16 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h" | 16 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h" |
17 #include "chrome/browser/chromeos/login/signin_screen_controller.h" | 17 #include "chrome/browser/chromeos/login/signin_screen_controller.h" |
18 #include "chrome/browser/chromeos/login/signin_specifics.h" | 18 #include "chrome/browser/chromeos/login/signin_specifics.h" |
19 #include "chrome/browser/chromeos/login/ui/lock_window.h" | 19 #include "chrome/browser/chromeos/login/ui/lock_window.h" |
20 #include "chrome/browser/chromeos/login/ui/login_display.h" | 20 #include "chrome/browser/chromeos/login/ui/login_display.h" |
21 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 21 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
22 #include "chromeos/dbus/power_manager_client.h" | 22 #include "chromeos/dbus/power_manager_client.h" |
23 #include "ui/gfx/display_observer.h" | |
23 #include "ui/keyboard/keyboard_controller_observer.h" | 24 #include "ui/keyboard/keyboard_controller_observer.h" |
24 #include "ui/views/widget/widget.h" | 25 #include "ui/views/widget/widget.h" |
25 #include "ui/views/widget/widget_observer.h" | 26 #include "ui/views/widget/widget_observer.h" |
26 | 27 |
27 namespace content { | 28 namespace content { |
28 class WebUI; | 29 class WebUI; |
29 } | 30 } |
30 | 31 |
31 namespace chromeos { | 32 namespace chromeos { |
32 | 33 |
(...skipping 12 matching lines...) Expand all Loading... | |
45 // This version of ScreenLockerDelegate displays a WebUI lock screen based on | 46 // This version of ScreenLockerDelegate displays a WebUI lock screen based on |
46 // the Oobe account picker screen. | 47 // the Oobe account picker screen. |
47 class WebUIScreenLocker : public WebUILoginView, | 48 class WebUIScreenLocker : public WebUILoginView, |
48 public LoginDisplay::Delegate, | 49 public LoginDisplay::Delegate, |
49 public ScreenLockerDelegate, | 50 public ScreenLockerDelegate, |
50 public LockWindow::Observer, | 51 public LockWindow::Observer, |
51 public ash::LockStateObserver, | 52 public ash::LockStateObserver, |
52 public views::WidgetObserver, | 53 public views::WidgetObserver, |
53 public PowerManagerClient::Observer, | 54 public PowerManagerClient::Observer, |
54 public ash::VirtualKeyboardStateObserver, | 55 public ash::VirtualKeyboardStateObserver, |
55 public keyboard::KeyboardControllerObserver { | 56 public keyboard::KeyboardControllerObserver, |
57 public gfx::DisplayObserver { | |
56 public: | 58 public: |
57 explicit WebUIScreenLocker(ScreenLocker* screen_locker); | 59 explicit WebUIScreenLocker(ScreenLocker* screen_locker); |
58 | 60 |
59 // ScreenLockerDelegate implementation. | 61 // ScreenLockerDelegate implementation. |
60 void LockScreen() override; | 62 void LockScreen() override; |
61 void ScreenLockReady() override; | 63 void ScreenLockReady() override; |
62 void OnAuthenticate() override; | 64 void OnAuthenticate() override; |
63 void SetInputEnabled(bool enabled) override; | 65 void SetInputEnabled(bool enabled) override; |
64 void ShowErrorMessage(int error_msg_id, | 66 void ShowErrorMessage(int error_msg_id, |
65 HelpAppLauncher::HelpTopic help_topic_id) override; | 67 HelpAppLauncher::HelpTopic help_topic_id) override; |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
105 | 107 |
106 // Overridden from content::WebContentsObserver: | 108 // Overridden from content::WebContentsObserver: |
107 void RenderProcessGone(base::TerminationStatus status) override; | 109 void RenderProcessGone(base::TerminationStatus status) override; |
108 | 110 |
109 // Overridden from ash::KeyboardStateObserver: | 111 // Overridden from ash::KeyboardStateObserver: |
110 void OnVirtualKeyboardStateChanged(bool activated) override; | 112 void OnVirtualKeyboardStateChanged(bool activated) override; |
111 | 113 |
112 // Overridden from keyboard::KeyboardControllerObserver: | 114 // Overridden from keyboard::KeyboardControllerObserver: |
113 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; | 115 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; |
114 | 116 |
117 // Overridden from gfx::DisplayObserver: | |
oshima
2015/01/29 15:29:06
nit: can you update these comments to new style?
Dmitry Polukhin
2015/01/29 15:39:17
Sorry, what do you mean by "new style"? I don't se
oshima
2015/01/29 16:16:09
// ClassName:
like
// gfx::DisplayObserver:
no
Dmitry Polukhin
2015/01/30 13:08:08
Done.
| |
118 void OnDisplayAdded(const gfx::Display& new_display) override; | |
119 void OnDisplayRemoved(const gfx::Display& old_display) override; | |
120 void OnDisplayMetricsChanged(const gfx::Display& display, | |
121 uint32_t changed_metrics) override; | |
122 | |
115 // Returns instance of the OOBE WebUI. | 123 // Returns instance of the OOBE WebUI. |
116 OobeUI* GetOobeUI(); | 124 OobeUI* GetOobeUI(); |
117 | 125 |
118 private: | 126 private: |
119 friend class test::WebUIScreenLockerTester; | 127 friend class test::WebUIScreenLockerTester; |
120 | 128 |
121 ~WebUIScreenLocker() override; | 129 ~WebUIScreenLocker() override; |
122 | 130 |
123 // Ensures that user pod is focused. | 131 // Ensures that user pod is focused. |
124 void FocusUserPod(); | 132 void FocusUserPod(); |
(...skipping 25 matching lines...) Expand all Loading... | |
150 gfx::Rect keyboard_bounds_; | 158 gfx::Rect keyboard_bounds_; |
151 | 159 |
152 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_; | 160 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_; |
153 | 161 |
154 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker); | 162 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker); |
155 }; | 163 }; |
156 | 164 |
157 } // namespace chromeos | 165 } // namespace chromeos |
158 | 166 |
159 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ | 167 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ |
OLD | NEW |