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..c07f85bc75048f72685b024f22adad0cf5707d35 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, |
@@ -361,6 +361,9 @@ void EasyUnlockService::OnTurnOffFlowFinished(bool success) { |
ClearRemoteDevices(); |
SetTurnOffFlowStatus(IDLE); |
+ // Make sure lock screen state set by the extension gets reset. |
+ screenlock_state_handler_.reset(); |
+ |
if (GetComponentLoader(profile_)->Exists(extension_misc::kEasyUnlockAppId)) { |
extensions::ExtensionSystem* extension_system = |
extensions::ExtensionSystem::Get(profile_); |