Chromium Code Reviews| Index: chrome/browser/signin/easy_unlock_service_signin_chromeos.cc |
| diff --git a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc |
| index 5c068cd3caf9f925780b78938c25a1f7f511656f..c51aae35be55de552bfe8b437382cafd8731bd77 100644 |
| --- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc |
| +++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc |
| @@ -16,6 +16,7 @@ |
| #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| #include "chrome/browser/signin/easy_unlock_app_manager.h" |
| #include "chrome/browser/signin/easy_unlock_metrics.h" |
| +#include "chrome/browser/signin/easy_unlock_util.h" |
| #include "chromeos/login/auth/user_context.h" |
| #include "chromeos/tpm/tpm_token_loader.h" |
|
sdefresne
2015/04/24 14:22:02
#include "components/proximity_auth/screenlock_bri
msarda
2015/04/24 15:47:05
Not needed - already included by its header chrom
|
| @@ -222,7 +223,7 @@ void EasyUnlockServiceSignin::InitializeInternal() { |
| service_active_ = true; |
| chromeos::LoginState::Get()->AddObserver(this); |
| - ScreenlockBridge* screenlock_bridge = ScreenlockBridge::Get(); |
| + ScreenlockBridge* screenlock_bridge = GetScreenlockBridgeInstance(); |
| screenlock_bridge->AddObserver(this); |
| if (!screenlock_bridge->focused_user_id().empty()) |
| OnFocusedUserChanged(screenlock_bridge->focused_user_id()); |
| @@ -234,7 +235,7 @@ void EasyUnlockServiceSignin::ShutdownInternal() { |
| service_active_ = false; |
| weak_ptr_factory_.InvalidateWeakPtrs(); |
| - ScreenlockBridge::Get()->RemoveObserver(this); |
| + GetScreenlockBridgeInstance()->RemoveObserver(this); |
| chromeos::LoginState::Get()->RemoveObserver(this); |
| STLDeleteContainerPairSecondPointers(user_data_.begin(), user_data_.end()); |
| user_data_.clear(); |