From 4d41bae2dff41e94eb0d840cf5f2491d0c406184 Mon Sep 17 00:00:00 2001 From: Jagadesh P Date: Thu, 4 Jul 2024 07:59:47 +0530 Subject: [PATCH] [Rebranding] Refactor |ReplaceChromeToBraveScheme| to use reference parameter and return boolean And minor refactoring in other places. --- browser/ui/brave_scheme_utils.cc | 9 +++++---- browser/ui/brave_scheme_utils.h | 3 ++- browser/ui/brave_scheme_utils_unittest.cc | 6 +++--- .../ui/toolbar/brave_location_bar_model_delegate.cc | 2 +- .../ui/views/tabs/tab_hover_card_bubble_view.cc | 6 +++--- .../ui/views/web_apps/web_app_views_utils.cc | 3 ++- .../ui/web_applications/app_browser_controller.cc | 2 +- .../ui/web_applications/app_browser_controller.h | 13 +++---------- 8 files changed, 20 insertions(+), 24 deletions(-) diff --git a/browser/ui/brave_scheme_utils.cc b/browser/ui/brave_scheme_utils.cc index 999969a7ba2..eb1108a82c4 100644 --- a/browser/ui/brave_scheme_utils.cc +++ b/browser/ui/brave_scheme_utils.cc @@ -11,14 +11,15 @@ namespace brave_utils { constexpr char16_t kChromeSchema16[] = u"chrome://"; constexpr char16_t kBraveSchema16[] = u"brave://"; -void ReplaceChromeToBraveScheme(std::u16string* url_string) { - if (base::StartsWith(*url_string, kChromeSchema16, +bool ReplaceChromeToBraveScheme(std::u16string& url_string) { + if (base::StartsWith(url_string, kChromeSchema16, base::CompareCase::INSENSITIVE_ASCII)) { - base::ReplaceFirstSubstringAfterOffset(url_string, 0, kChromeSchema16, + base::ReplaceFirstSubstringAfterOffset(&url_string, 0, kChromeSchema16, kBraveSchema16); + return true; } - return; + return false; } } // namespace brave_utils diff --git a/browser/ui/brave_scheme_utils.h b/browser/ui/brave_scheme_utils.h index 716df7dc1be..389222c19ad 100644 --- a/browser/ui/brave_scheme_utils.h +++ b/browser/ui/brave_scheme_utils.h @@ -9,7 +9,8 @@ #include namespace brave_utils { -void ReplaceChromeToBraveScheme(std::u16string* url_string); +// Replaces the chrome:// scheme with brave:// scheme in the given |url_string|. +bool ReplaceChromeToBraveScheme(std::u16string& url_string); } // namespace brave_utils #endif // BRAVE_BROWSER_UI_BRAVE_SCHEME_UTILS_H_ diff --git a/browser/ui/brave_scheme_utils_unittest.cc b/browser/ui/brave_scheme_utils_unittest.cc index 492f0b3fcde..db12f011c1b 100644 --- a/browser/ui/brave_scheme_utils_unittest.cc +++ b/browser/ui/brave_scheme_utils_unittest.cc @@ -9,14 +9,14 @@ TEST(BraveSchemeUtilsTest, ReplaceChromeToBraveScheme) { std::u16string url_string = u"chrome://settings"; - brave_utils::ReplaceChromeToBraveScheme(&url_string); + brave_utils::ReplaceChromeToBraveScheme(url_string); EXPECT_EQ(url_string, u"brave://settings"); url_string = u"chrome://flags"; - brave_utils::ReplaceChromeToBraveScheme(&url_string); + brave_utils::ReplaceChromeToBraveScheme(url_string); EXPECT_EQ(url_string, u"brave://flags"); url_string = u"https://search.brave.com"; - brave_utils::ReplaceChromeToBraveScheme(&url_string); + brave_utils::ReplaceChromeToBraveScheme(url_string); EXPECT_EQ(url_string, u"https://search.brave.com"); } diff --git a/browser/ui/toolbar/brave_location_bar_model_delegate.cc b/browser/ui/toolbar/brave_location_bar_model_delegate.cc index 6e0f25f8103..754c14b391c 100644 --- a/browser/ui/toolbar/brave_location_bar_model_delegate.cc +++ b/browser/ui/toolbar/brave_location_bar_model_delegate.cc @@ -38,7 +38,7 @@ void BraveLocationBarModelDelegate::FormattedStringFromURL( const GURL& url, std::u16string* new_formatted_url) { // Replace chrome:// with brave:// - brave_utils::ReplaceChromeToBraveScheme(new_formatted_url); + brave_utils::ReplaceChromeToBraveScheme(*new_formatted_url); #if BUILDFLAG(ETHEREUM_REMOTE_CLIENT_ENABLED) if (url.SchemeIs(kChromeExtensionScheme) && diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc index ef568990160..1553caecc75 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc @@ -30,9 +30,9 @@ void TabHoverCardBubbleView_ChromiumImpl::BraveUpdateCardContent( // Replace chrome:// with brave://. Since this is purely in the UI we can // just do a sub-string replacement instead of parsing into GURL. std::u16string domain = domain_label_->GetText(); - brave_utils::ReplaceChromeToBraveScheme(&domain); - - domain_label_->SetData({domain, /*is_filename*/ false}); + if (brave_utils::ReplaceChromeToBraveScheme(domain)) { + domain_label_->SetData({domain, /*is_filename*/ false}); + } } void TabHoverCardBubbleView::UpdateCardContent(const Tab* tab) { diff --git a/chromium_src/chrome/browser/ui/views/web_apps/web_app_views_utils.cc b/chromium_src/chrome/browser/ui/views/web_apps/web_app_views_utils.cc index d5f1c6c7835..b95c52e1d1b 100644 --- a/chromium_src/chrome/browser/ui/views/web_apps/web_app_views_utils.cc +++ b/chromium_src/chrome/browser/ui/views/web_apps/web_app_views_utils.cc @@ -17,8 +17,9 @@ std::unique_ptr CreateOriginLabelFromStartUrl( bool is_primary_text) { std::unique_ptr origin_label = CreateOriginLabelFromStartUrl_ChromiumImpl(start_url, is_primary_text); + CHECK(origin_label); std::u16string label_text = origin_label->GetText(); - brave_utils::ReplaceChromeToBraveScheme(&label_text); + brave_utils::ReplaceChromeToBraveScheme(label_text); origin_label->SetText(label_text); return origin_label; diff --git a/chromium_src/chrome/browser/ui/web_applications/app_browser_controller.cc b/chromium_src/chrome/browser/ui/web_applications/app_browser_controller.cc index 45047ddda23..d9257a55288 100644 --- a/chromium_src/chrome/browser/ui/web_applications/app_browser_controller.cc +++ b/chromium_src/chrome/browser/ui/web_applications/app_browser_controller.cc @@ -18,7 +18,7 @@ std::u16string AppBrowserController::FormatUrlOrigin( const GURL& url, url_formatter::FormatUrlTypes format_types) { std::u16string url_string = FormatUrlOrigin_ChromiumImpl(url, format_types); - brave_utils::ReplaceChromeToBraveScheme(&url_string); + brave_utils::ReplaceChromeToBraveScheme(url_string); return url_string; } diff --git a/chromium_src/chrome/browser/ui/web_applications/app_browser_controller.h b/chromium_src/chrome/browser/ui/web_applications/app_browser_controller.h index d486ba2910b..016b29a5a96 100644 --- a/chromium_src/chrome/browser/ui/web_applications/app_browser_controller.h +++ b/chromium_src/chrome/browser/ui/web_applications/app_browser_controller.h @@ -6,16 +6,9 @@ #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_WEB_APPLICATIONS_APP_BROWSER_CONTROLLER_H_ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_WEB_APPLICATIONS_APP_BROWSER_CONTROLLER_H_ -#define FormatUrlOrigin \ - FormatUrlOrigin_ChromiumImpl( \ - const GURL& url, \ - url_formatter::FormatUrlTypes format_types = \ - url_formatter::kFormatUrlOmitUsernamePassword | \ - url_formatter::kFormatUrlOmitHTTPS | \ - url_formatter::kFormatUrlOmitHTTP | \ - url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname | \ - url_formatter::kFormatUrlOmitTrivialSubdomains); \ - static std::u16string FormatUrlOrigin +#define FormatUrlOrigin(...) \ + FormatUrlOrigin_ChromiumImpl(__VA_ARGS__); \ + static std::u16string FormatUrlOrigin(__VA_ARGS__) #include "src/chrome/browser/ui/web_applications/app_browser_controller.h" // IWYU pragma: export #undef FormatUrlOrigin