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_SCREEN_LOCKER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_ |
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/callback_forward.h" | 11 #include "base/callback_forward.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
14 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
15 #include "base/sequenced_task_runner_helpers.h" | 15 #include "base/sequenced_task_runner_helpers.h" |
16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
17 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 17 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
18 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h" | 18 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h" |
19 #include "chrome/browser/chromeos/login/quick_unlock/feature_notification_contro ller.h" | |
19 #include "chrome/browser/chromeos/login/ui/login_display.h" | 20 #include "chrome/browser/chromeos/login/ui/login_display.h" |
20 #include "chromeos/login/auth/auth_status_consumer.h" | 21 #include "chromeos/login/auth/auth_status_consumer.h" |
21 #include "chromeos/login/auth/user_context.h" | 22 #include "chromeos/login/auth/user_context.h" |
22 #include "components/user_manager/user.h" | 23 #include "components/user_manager/user.h" |
23 #include "ui/base/accelerators/accelerator.h" | 24 #include "ui/base/accelerators/accelerator.h" |
24 #include "ui/base/ime/chromeos/input_method_manager.h" | 25 #include "ui/base/ime/chromeos/input_method_manager.h" |
25 | 26 |
26 namespace content { | 27 namespace content { |
27 class WebUI; | 28 class WebUI; |
28 } | 29 } |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
187 | 188 |
188 // Copy of parameters passed to last call of OnLoginSuccess for usage in | 189 // Copy of parameters passed to last call of OnLoginSuccess for usage in |
189 // UnlockOnLoginSuccess(). | 190 // UnlockOnLoginSuccess(). |
190 std::unique_ptr<AuthenticationParametersCapture> authentication_capture_; | 191 std::unique_ptr<AuthenticationParametersCapture> authentication_capture_; |
191 | 192 |
192 // Provider for button icon set by the screenlockPrivate API. | 193 // Provider for button icon set by the screenlockPrivate API. |
193 std::unique_ptr<ScreenlockIconProvider> screenlock_icon_provider_; | 194 std::unique_ptr<ScreenlockIconProvider> screenlock_icon_provider_; |
194 | 195 |
195 scoped_refptr<input_method::InputMethodManager::State> saved_ime_state_; | 196 scoped_refptr<input_method::InputMethodManager::State> saved_ime_state_; |
196 | 197 |
198 // Quick Unlock Feature Notification controller. | |
199 scoped_refptr<quickunlock::FeatureNotificationController> | |
jdufault
2016/07/07 22:08:01
The screen locker shouldn't own an instance of the
malaykeshav
2016/07/07 22:39:43
Done
| |
200 qu_feature_notification_controller_; | |
201 | |
197 base::WeakPtrFactory<ScreenLocker> weak_factory_; | 202 base::WeakPtrFactory<ScreenLocker> weak_factory_; |
198 | 203 |
199 DISALLOW_COPY_AND_ASSIGN(ScreenLocker); | 204 DISALLOW_COPY_AND_ASSIGN(ScreenLocker); |
200 }; | 205 }; |
201 | 206 |
202 } // namespace chromeos | 207 } // namespace chromeos |
203 | 208 |
204 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_ | 209 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_H_ |
OLD | NEW |