Commit ec84346c authored by James Vecore's avatar James Vecore Committed by Commit Bot

[Nearby] Add additional Nearby Share prefs for settings

Some of these prefs will be directly set in settings while other will be
managed by Nearby's local device manager. The settings added to the
allow list in settingsPrivate will be used directly in settings.

Change-Id: If16722bb8441776a7ff057e01532d19ac2bc7c0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2289211
Commit-Queue: James Vecore <vecore@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Auto-Submit: James Vecore <vecore@google.com>
Cr-Commit-Position: refs/heads/master@{#786613}
parent 8faac768
......@@ -17,25 +17,36 @@ const char prefs::kNearbySharingActiveProfilePrefName[] =
const char prefs::kNearbySharingBackgroundVisibilityName[] =
"nearby_sharing.background_visibility";
const char prefs::kNearbySharingDataUsageName[] = "nearby_sharing.data_usage";
const char prefs::kNearbySharingDeviceIdPrefName[] = "nearby_sharing.device_id";
const char prefs::kNearbySharingDeviceNamePrefName[] =
"nearby_sharing.device_name";
const char prefs::kNearbySharingFullNamePrefName[] = "nearby_sharing.full_name";
const char prefs::kNearbySharingIconUrlPrefName[] = "nearby_sharing.icon_url";
void RegisterNearbySharingPrefs(user_prefs::PrefRegistrySyncable* registry) {
// This pref is not synced.
// These prefs are not synced across devices on purpose.
// TODO(vecore): Change the default to false after the settings ui is
// available.
registry->RegisterBooleanPref(
prefs::kNearbySharingEnabledPrefName, true /* default_value */,
PrefRegistry::PrefRegistrationFlags::NO_REGISTRATION_FLAGS /* flags */);
registry->RegisterBooleanPref(prefs::kNearbySharingEnabledPrefName,
/*default_value=*/true);
registry->RegisterIntegerPref(
prefs::kNearbySharingBackgroundVisibilityName,
static_cast<int>(Visibility::kNoOne) /* default_value */,
PrefRegistry::PrefRegistrationFlags::NO_REGISTRATION_FLAGS /* flags */);
/*default_value=*/static_cast<int>(Visibility::kNoOne));
registry->RegisterIntegerPref(
prefs::kNearbySharingDataUsageName,
static_cast<int>(DataUsage::kWifiOnly) /* default_value */,
PrefRegistry::PrefRegistrationFlags::NO_REGISTRATION_FLAGS /* flags */);
/*default_value=*/static_cast<int>(DataUsage::kWifiOnly));
registry->RegisterStringPref(prefs::kNearbySharingDeviceIdPrefName,
/*default_value=*/std::string());
registry->RegisterStringPref(prefs::kNearbySharingDeviceNamePrefName,
/*default_value=*/std::string());
registry->RegisterStringPref(prefs::kNearbySharingFullNamePrefName,
/*default_value=*/std::string());
registry->RegisterStringPref(prefs::kNearbySharingIconUrlPrefName,
/*default_value=*/std::string());
}
void RegisterNearbySharingLocalPrefs(PrefRegistrySimple* local_state) {
local_state->RegisterFilePathPref(prefs::kNearbySharingActiveProfilePrefName,
base::FilePath() /* default_value */);
/*default_value=*/base::FilePath());
}
......@@ -18,6 +18,10 @@ extern const char kNearbySharingEnabledPrefName[];
extern const char kNearbySharingActiveProfilePrefName[];
extern const char kNearbySharingBackgroundVisibilityName[];
extern const char kNearbySharingDataUsageName[];
extern const char kNearbySharingDeviceIdPrefName[];
extern const char kNearbySharingDeviceNamePrefName[];
extern const char kNearbySharingFullNamePrefName[];
extern const char kNearbySharingIconUrlPrefName[];
} // namespace prefs
void RegisterNearbySharingPrefs(user_prefs::PrefRegistrySyncable* registry);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment