Index: chrome/browser/chromeos/login/screens/user_selection_screen.h |
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h |
index 74eab73c32f9b556463fbd86d970cc03ee9ae4f3..7b9c684e59acae880f6298c8478ec588b96578d0 100644 |
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.h |
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h |
@@ -15,7 +15,7 @@ |
#include "chrome/browser/chromeos/login/signin/token_handle_util.h" |
#include "chrome/browser/chromeos/login/ui/login_display.h" |
#include "chrome/browser/chromeos/login/ui/models/user_board_model.h" |
-#include "chrome/browser/signin/screenlock_bridge.h" |
+#include "components/proximity_auth/screenlock_bridge.h" |
#include "components/user_manager/user.h" |
#include "components/user_manager/user_id.h" |
#include "ui/base/user_activity/user_activity_observer.h" |
@@ -28,9 +28,10 @@ class LoginDisplayWebUIHandler; |
class UserBoardView; |
// This class represents User Selection screen: user pod-based login screen. |
-class UserSelectionScreen : public ui::UserActivityObserver, |
- public ScreenlockBridge::LockHandler, |
- public UserBoardModel { |
+class UserSelectionScreen |
+ : public ui::UserActivityObserver, |
+ public proximity_auth::ScreenlockBridge::LockHandler, |
+ public UserBoardModel { |
public: |
explicit UserSelectionScreen(const std::string& display_type); |
~UserSelectionScreen() override; |
@@ -61,11 +62,12 @@ class UserSelectionScreen : public ui::UserActivityObserver, |
void InitEasyUnlock(); |
- // ScreenlockBridge::LockHandler implementation: |
+ // proximity_auth::ScreenlockBridge::LockHandler implementation: |
void ShowBannerMessage(const base::string16& message) override; |
void ShowUserPodCustomIcon( |
const std::string& user_email, |
- const ScreenlockBridge::UserPodCustomIconOptions& icon) override; |
+ const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions& icon) |
+ override; |
void HideUserPodCustomIcon(const std::string& user_email) override; |
void EnableInput() override; |
@@ -135,7 +137,7 @@ class UserSelectionScreen : public ui::UserActivityObserver, |
// Map of usernames to their current authentication type. If a user is not |
// contained in the map, it is using the default authentication type. |
- std::map<std::string, ScreenlockBridge::LockHandler::AuthType> |
+ std::map<std::string, proximity_auth::ScreenlockBridge::LockHandler::AuthType> |
user_auth_type_map_; |
// Timer for measuring idle state duration before password clear. |