diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp index 91d34d6e1e2..44fe2f61ccf 100644 --- a/app/brave_settings_strings.grdp +++ b/app/brave_settings_strings.grdp @@ -747,8 +747,8 @@ Could not sync Brave on your devices - - Enable custom sync url + + Custom sync url Enter custom sync url diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc index 5df8d257d79..d8dc3b39a3e 100644 --- a/browser/brave_local_state_prefs.cc +++ b/browser/brave_local_state_prefs.cc @@ -171,9 +171,6 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { misc_metrics::GeneralBrowserUsage::RegisterPrefs(registry); playlist::PlaylistServiceFactory::RegisterLocalStatePrefs(registry); - - registry->RegisterBooleanPref(kBraveCustomSyncUrlEnabled, false); - registry->RegisterStringPref(kBraveCustomSyncUrl, std::string()); } } // namespace brave diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc index 4c4f80c81a8..c3fc2d0ca92 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.cc +++ b/browser/extensions/api/settings_private/brave_prefs_util.cc @@ -10,6 +10,7 @@ #include "brave/components/brave_news/common/pref_names.h" #include "brave/components/brave_rewards/common/pref_names.h" #include "brave/components/brave_shields/core/common/pref_names.h" +#include "brave/components/brave_sync/brave_sync_prefs.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wayback_machine/buildflags/buildflags.h" @@ -213,9 +214,8 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() { (*s_brave_allowlist)[kMRUCyclingEnabled] = settings_api::PrefType::kBoolean; // Sync prefs - (*s_brave_allowlist)[kBraveCustomSyncUrlEnabled] = - settings_api::PrefType::kBoolean; - (*s_brave_allowlist)[kBraveCustomSyncUrl] = settings_api::PrefType::kUrl; + (*s_brave_allowlist)[brave_sync::kCustomSyncServiceUrl] = + settings_api::PrefType::kUrl; // WebTorrent pref (*s_brave_allowlist)[kWebTorrentEnabled] = settings_api::PrefType::kBoolean; diff --git a/browser/resources/settings/brave_sync_page/brave_sync_browser_proxy.ts b/browser/resources/settings/brave_sync_page/brave_sync_browser_proxy.ts index 25ee7dfcede..f34334be5ee 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_browser_proxy.ts +++ b/browser/resources/settings/brave_sync_page/brave_sync_browser_proxy.ts @@ -58,10 +58,6 @@ export class BraveSyncBrowserProxy { return sendWithPromise('SyncGetWordsCount', syncCode); } - wasCustomSyncUrlEnabledAtStartup(): boolean { - return loadTimeData.getBoolean('customSyncUrlEnabledAtStartup'); - } - getCustomSyncUrlAtStartup(): string { return loadTimeData.getString('customSyncUrlAtStartup'); } diff --git a/browser/resources/settings/brave_sync_page/brave_sync_page.html b/browser/resources/settings/brave_sync_page/brave_sync_page.html index cc1aebb5daa..c6c0a10880a 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_page.html +++ b/browser/resources/settings/brave_sync_page/brave_sync_page.html @@ -1,16 +1,8 @@ - - + +
+
+ +
-