| Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| index 2156e875ba8628f148baace53f9a2db02cb3f8a4..0ec352512084987c698091b6916a3cf2faf620d1 100644
|
| --- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| @@ -18,9 +18,11 @@
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/signin/easy_unlock_service.h"
|
| -#include "chrome/browser/signin/screenlock_bridge.h"
|
| +#include "chrome/browser/signin/easy_unlock_util.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
|
| +#include "components/proximity_auth/screenlock_bridge.h"
|
| +#include "components/signin/core/browser/signin_manager_base.h"
|
| #include "components/user_manager/user_id.h"
|
| #include "components/user_manager/user_manager.h"
|
| #include "components/user_manager/user_type.h"
|
| @@ -118,14 +120,14 @@ UserSelectionScreen::UserSelectionScreen(const std::string& display_type)
|
| }
|
|
|
| UserSelectionScreen::~UserSelectionScreen() {
|
| - ScreenlockBridge::Get()->SetLockHandler(nullptr);
|
| + GetScreenlockBridgeInstance()->SetLockHandler(nullptr);
|
| ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
|
| if (activity_detector->HasObserver(this))
|
| activity_detector->RemoveObserver(this);
|
| }
|
|
|
| void UserSelectionScreen::InitEasyUnlock() {
|
| - ScreenlockBridge::Get()->SetLockHandler(this);
|
| + GetScreenlockBridgeInstance()->SetLockHandler(this);
|
| }
|
|
|
| void UserSelectionScreen::SetLoginDisplayDelegate(
|
|
|