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

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

Issue 2973243002: Adding pref to store the user-selected proximity threshold. (Closed)
Patch Set: Fixing merge issues Created 3 years, 5 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
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | components/proximity_auth/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_service_regular.cc
diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc
index bcbedd079d6f46518d8eb4ff3e5933b133b6e756..f94be93a3b5399bf9e5e8318afc3b10d7fdd6d9f 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.cc
+++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -41,6 +41,7 @@
#include "components/prefs/scoped_user_pref_update.h"
#include "components/proximity_auth/logging/logging.h"
#include "components/proximity_auth/proximity_auth_pref_manager.h"
+#include "components/proximity_auth/proximity_auth_pref_names.h"
#include "components/proximity_auth/proximity_auth_system.h"
#include "components/proximity_auth/screenlock_bridge.h"
#include "components/proximity_auth/switches.h"
@@ -454,6 +455,9 @@ void EasyUnlockServiceRegular::InitializeInternal() {
prefs::kEasyUnlockAllowed,
base::Bind(&EasyUnlockServiceRegular::OnPrefsChanged,
base::Unretained(this)));
+ registrar_.Add(proximity_auth::prefs::kEasyUnlockProximityThreshold,
+ base::Bind(&EasyUnlockServiceRegular::OnPrefsChanged,
+ base::Unretained(this)));
OnPrefsChanged();
@@ -615,6 +619,10 @@ void EasyUnlockServiceRegular::SyncProfilePrefsToLocalState() {
// items in the dictionary are the same profile prefs used for Easy Unlock.
std::unique_ptr<base::DictionaryValue> user_prefs_dict(
new base::DictionaryValue());
+ user_prefs_dict->SetIntegerWithoutPathExpansion(
+ proximity_auth::prefs::kEasyUnlockProximityThreshold,
+ profile_prefs->GetInteger(
+ proximity_auth::prefs::kEasyUnlockProximityThreshold));
DictionaryPrefUpdate update(local_state,
prefs::kEasyUnlockLocalStateUserPrefs);
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | components/proximity_auth/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698