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

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..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_);
« no previous file with comments | « chrome/browser/signin/easy_unlock_screenlock_state_handler.cc ('k') | chrome/common/extensions/api/easy_unlock_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698