diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index fc647673f41b..8dc75f0e3576 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -53,13 +53,19 @@ bool HandleURLRewrite(GURL* url, *url = GURL(kBraveUIWelcomeURL); return true; } + if (url->SchemeIs(content::kChromeUIScheme) && + (url->host() == kBraveUISyncHost)) { + *url = GURL(kBraveUISyncURL); + return true; + } return false; } bool HandleURLReverseRewrite(GURL* url, content::BrowserContext* browser_context) { - if (url->spec() == kBraveUIWelcomeURL) { + if (url->spec() == kBraveUIWelcomeURL || + url->spec() == kBraveUISyncURL) { return true; } return false; diff --git a/browser/brave_content_browser_client_browsertest.cc b/browser/brave_content_browser_client_browsertest.cc index 3651410392d4..1411fd8a62ef 100644 --- a/browser/brave_content_browser_client_browsertest.cc +++ b/browser/brave_content_browser_client_browsertest.cc @@ -102,7 +102,8 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, CanLoadCustomBravePages) { #if BUILDFLAG(BRAVE_REWARDS_ENABLED) GURL("chrome://rewards/"), #endif - GURL("chrome://welcome/") + GURL("chrome://welcome/"), + GURL("chrome://sync/") }; std::for_each(urls.begin(), urls.end(), [this](const GURL& url) { content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); diff --git a/browser/profiles/brave_profile_manager.cc b/browser/profiles/brave_profile_manager.cc index 24fab13ab1e5..77db651c032f 100644 --- a/browser/profiles/brave_profile_manager.cc +++ b/browser/profiles/brave_profile_manager.cc @@ -94,7 +94,7 @@ void BraveProfileManager::DoFinalInitForServices(Profile* profile, bool go_off_the_record) { ProfileManager::DoFinalInitForServices(profile, go_off_the_record); // BraveSyncService need to be created when profile initialized, otherwise - // it will only be constructed only when we open chrome://bravesync + // it will only be constructed only when we open chrome:/sync/ brave_sync::BraveSyncServiceFactory::GetForProfile(profile); } 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 ad5160e995d1..5499ad4e2603 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_page.html +++ b/browser/resources/settings/brave_sync_page/brave_sync_page.html @@ -12,7 +12,7 @@
- $i18n{braveSyncLabel} brave://bravesync + $i18n{braveSyncLabel} brave://sync
diff --git a/browser/ui/webui/brave_web_ui_controller_factory.cc b/browser/ui/webui/brave_web_ui_controller_factory.cc index ff9ba554b8f9..c558ab87c538 100644 --- a/browser/ui/webui/brave_web_ui_controller_factory.cc +++ b/browser/ui/webui/brave_web_ui_controller_factory.cc @@ -41,8 +41,7 @@ WebUIController* NewWebUI(WebUI* web_ui, const GURL& url) { auto host = url.host_piece(); if (host == kBraveUISyncHost && brave_sync::BraveSyncService::is_enabled()) { return new SyncUI(web_ui, url.host()); - } else - if (host == kAdblockHost) { + } else if (host == kAdblockHost) { return new BraveAdblockUI(web_ui, url.host()); #if BUILDFLAG(BRAVE_REWARDS_ENABLED) } else if (host == kRewardsHost) { diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc index bb472c894013..c06806310970 100644 --- a/browser/ui/webui/brave_webui_source.cc +++ b/browser/ui/webui/brave_webui_source.cc @@ -429,7 +429,7 @@ void CustomizeWebUIHTMLSource(const std::string &name, content::WebUIDataSource* { "yourWallet", IDS_BRAVE_UI_YOUR_WALLET } } }, { - std::string("bravesync"), { + std::string("sync"), { { "sync", IDS_BRAVE_SYNC_TITLE }, { "beta", IDS_BRAVE_SYNC_TITLE_BETA }, { "syncInfo1", IDS_BRAVE_SYNC_INFO_1 }, diff --git a/common/webui_url_constants.cc b/common/webui_url_constants.cc index 8be8ad64b067..4a3ddeef3c6a 100644 --- a/common/webui_url_constants.cc +++ b/common/webui_url_constants.cc @@ -13,10 +13,10 @@ const char kWelcomeJS[] = "brave_welcome.js"; const char kDonateHost[] = "donate"; const char kDonateJS[] = "brave_donate.js"; const char kBraveNewTabJS[] = "brave_new_tab.js"; -const char kBraveUISyncHost[] = "bravesync"; +const char kBraveUISyncHost[] = "sync"; const char kBraveSyncJS[] = "brave_sync.js"; const char kBraveUIWelcomeURL[] = "chrome://welcome/"; const char kBraveUIRewardsURL[] = "chrome://rewards/"; const char kBraveUIAdblockURL[] = "chrome://adblock/"; const char kBraveUIDonateURL[] = "chrome://donate/"; -const char kBraveUISyncURL[] = "chrome://bravesync"; +const char kBraveUISyncURL[] = "chrome://sync/";