| 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 35abeb32ff13107673ffd8f3349500614de7f9ec..6713a90f82452c5f52b9ab1417a67d945bf57d84 100644
|
| --- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
|
| +++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
|
| @@ -177,10 +177,10 @@ void EasyUnlockServiceSignin::InitializeInternal() {
|
| service_active_ = true;
|
|
|
| chromeos::LoginState::Get()->AddObserver(this);
|
| - ScreenlockBridge* screenlock_bridge = ScreenlockBridge::Get();
|
| - screenlock_bridge->AddObserver(this);
|
| - if (!screenlock_bridge->focused_user_id().empty())
|
| - OnFocusedUserChanged(screenlock_bridge->focused_user_id());
|
| + SigninScreenBridge* signin_screen_bridge = SigninScreenBridge::Get();
|
| + signin_screen_bridge->AddObserver(this);
|
| + if (!signin_screen_bridge->focused_user_id().empty())
|
| + OnFocusedUserChanged(signin_screen_bridge->focused_user_id());
|
| }
|
|
|
| void EasyUnlockServiceSignin::ShutdownInternal() {
|
| @@ -189,7 +189,7 @@ void EasyUnlockServiceSignin::ShutdownInternal() {
|
| service_active_ = false;
|
|
|
| weak_ptr_factory_.InvalidateWeakPtrs();
|
| - ScreenlockBridge::Get()->RemoveObserver(this);
|
| + SigninScreenBridge::Get()->RemoveObserver(this);
|
| chromeos::LoginState::Get()->RemoveObserver(this);
|
| STLDeleteContainerPairSecondPointers(user_data_.begin(), user_data_.end());
|
| user_data_.clear();
|
|
|