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

Side by Side Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.h

Issue 908033005: Move password reset on login screen from after wake up to before suspend (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove code duplication Created 5 years, 10 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 unified diff | Download patch
OLDNEW
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"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 // LockWindow::Observer: 95 // LockWindow::Observer:
96 void OnLockWindowReady() override; 96 void OnLockWindowReady() override;
97 97
98 // LockStateObserver: 98 // LockStateObserver:
99 void OnLockStateEvent(ash::LockStateObserver::EventType event) override; 99 void OnLockStateEvent(ash::LockStateObserver::EventType event) override;
100 100
101 // WidgetObserver: 101 // WidgetObserver:
102 void OnWidgetDestroying(views::Widget* widget) override; 102 void OnWidgetDestroying(views::Widget* widget) override;
103 103
104 // PowerManagerClient::Observer: 104 // PowerManagerClient::Observer:
105 void SuspendImminent() override;
105 void SuspendDone(const base::TimeDelta& sleep_duration) override; 106 void SuspendDone(const base::TimeDelta& sleep_duration) override;
106 void LidEventReceived(bool open, const base::TimeTicks& time) override; 107 void LidEventReceived(bool open, const base::TimeTicks& time) override;
107 108
108 // content::WebContentsObserver: 109 // content::WebContentsObserver:
109 void RenderProcessGone(base::TerminationStatus status) override; 110 void RenderProcessGone(base::TerminationStatus status) override;
110 111
111 // ash::KeyboardStateObserver: 112 // ash::KeyboardStateObserver:
112 void OnVirtualKeyboardStateChanged(bool activated) override; 113 void OnVirtualKeyboardStateChanged(bool activated) override;
113 114
114 // keyboard::KeyboardControllerObserver: 115 // keyboard::KeyboardControllerObserver:
115 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; 116 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
116 117
117 // gfx::DisplayObserver: 118 // gfx::DisplayObserver:
118 void OnDisplayAdded(const gfx::Display& new_display) override; 119 void OnDisplayAdded(const gfx::Display& new_display) override;
119 void OnDisplayRemoved(const gfx::Display& old_display) override; 120 void OnDisplayRemoved(const gfx::Display& old_display) override;
120 void OnDisplayMetricsChanged(const gfx::Display& display, 121 void OnDisplayMetricsChanged(const gfx::Display& display,
121 uint32_t changed_metrics) override; 122 uint32_t changed_metrics) override;
122 123
123 // Returns instance of the OOBE WebUI. 124 // Returns instance of the OOBE WebUI.
124 OobeUI* GetOobeUI(); 125 OobeUI* GetOobeUI();
125 126
126 private: 127 private:
127 friend class test::WebUIScreenLockerTester; 128 friend class test::WebUIScreenLockerTester;
128 129
129 ~WebUIScreenLocker() override; 130 ~WebUIScreenLocker() override;
130 131
131 // Ensures that user pod is focused. 132 // Ensures that user pod is focused.
132 void FocusUserPod(); 133 void FocusUserPod();
133 134
135 // Reset user pod and ensures that user pod is focused.
136 void ResetAndFocusUserPod();
137
134 // The screen locker window. 138 // The screen locker window.
135 views::Widget* lock_window_; 139 views::Widget* lock_window_;
136 140
137 // Sign-in Screen controller instance (owns login screens). 141 // Sign-in Screen controller instance (owns login screens).
138 scoped_ptr<SignInScreenController> signin_screen_controller_; 142 scoped_ptr<SignInScreenController> signin_screen_controller_;
139 143
140 // Login UI implementation instance. 144 // Login UI implementation instance.
141 scoped_ptr<WebUILoginDisplay> login_display_; 145 scoped_ptr<WebUILoginDisplay> login_display_;
142 146
143 // Tracks when the lock window is displayed and ready. 147 // Tracks when the lock window is displayed and ready.
(...skipping 14 matching lines...) Expand all
158 gfx::Rect keyboard_bounds_; 162 gfx::Rect keyboard_bounds_;
159 163
160 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_; 164 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_;
161 165
162 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker); 166 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker);
163 }; 167 };
164 168
165 } // namespace chromeos 169 } // namespace chromeos
166 170
167 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ 171 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698