diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 6d67997e4d76..395d51a534ef 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2025-10-02 04:28:32 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2025-10-30 15:44:36 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -86,7 +86,7 @@ +@@ -86,12 +86,12 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif @@ -9,7 +9,22 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -394,7 +394,7 @@ void ShowChromeTips(Browser* browser) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/webapps/isolated_web_apps/scheme.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +@@ -253,7 +253,7 @@ bool SiteGURLIsValid(const GURL& url) { + return !site_origin.opaque() && (url.SchemeIsHTTPOrHTTPS() || + url.SchemeIs(extensions::kExtensionScheme) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + || url.SchemeIs(webapps::kIsolatedAppScheme) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +@@ -415,7 +415,7 @@ void ShowChromeTips(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeTipsURL)); } @@ -18,7 +33,7 @@ void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -719,7 +719,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -744,7 +744,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } #endif // BUILDFLAG(IS_CHROMEOS) |