Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Unified Diff: chrome/browser/signin/easy_unlock_service.cc

Issue 485243002: Fix few minor easy unlock bugs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
}
}

Powered by Google App Engine
This is Rietveld 408576698