Chromium Code Reviews| Index: chrome/browser/signin/easy_unlock_service.cc |
| diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc |
| index afbb94f5e4bb604fe97233a6fd6f03ea016f8ca7..e25ae21760ce8c363517d49573581fb19e3fd0c0 100644 |
| --- a/chrome/browser/signin/easy_unlock_service.cc |
| +++ b/chrome/browser/signin/easy_unlock_service.cc |
| @@ -131,7 +131,7 @@ void EasyUnlockService::RegisterProfilePrefs( |
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| registry->RegisterBooleanPref( |
| prefs::kEasyUnlockShowTutorial, |
| - false, |
| + true, |
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| registry->RegisterDictionaryPref( |
| prefs::kEasyUnlockPairing, |
| @@ -366,5 +366,8 @@ void EasyUnlockService::OnTurnOffFlowFinished(bool success) { |
| extensions::ExtensionSystem::Get(profile_); |
| extension_system->extension_service()->ReloadExtension( |
| extension_misc::kEasyUnlockAppId); |
| + |
| + // Make sure lock screen state set by the extension gets reset. |
| + screenlock_state_handler_.reset(); |
|
xiyuan
2014/08/19 20:17:13
Do we want to always do this rather than only when
tbarzic
2014/08/19 20:24:59
yeah, that would probably be a bit cleaner (though
|
| } |
| } |