aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_webui__url__constants.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_common_webui__url__constants.cc')
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.cc36
1 files changed, 16 insertions, 20 deletions
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index fd685308f678..27a3cbcb2b20 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,13 +1,13 @@
---- chrome/common/webui_url_constants.cc.orig 2021-09-24 04:26:00 UTC
+--- chrome/common/webui_url_constants.cc.orig 2021-12-31 00:57:26 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -372,12 +372,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings";
- const char kChromeUIOSSettingsURL[] = "chrome://os-settings/";
+@@ -385,12 +385,12 @@ const char kChromeUIWebUIJsErrorHost[] = "webuijserror
+ const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/";
#endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- const char kChromeUIWebUIJsErrorHost[] = "webuijserror";
- const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/";
+-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_CHROMEOS)
+ const char kChromeUIConnectorsInternalsHost[] = "connectors-internals";
#endif
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
@@ -15,7 +15,7 @@
defined(OS_CHROMEOS)
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
-@@ -392,7 +392,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb
+@@ -405,7 +405,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb
const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
#endif
@@ -24,7 +24,7 @@
defined(OS_ANDROID)
const char kChromeUISandboxHost[] = "sandbox";
#endif
-@@ -400,7 +400,7 @@ const char kChromeUISandboxHost[] = "sandbox";
+@@ -413,7 +413,7 @@ const char kChromeUISandboxHost[] = "sandbox";
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) || \
@@ -33,7 +33,7 @@
const char kChromeUIBrowserSwitchHost[] = "browser-switch";
const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
const char kChromeUIEnterpriseProfileWelcomeHost[] =
-@@ -415,7 +415,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -428,7 +428,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
const char kChromeUIProfilePickerStartupQuery[] = "startup";
#endif
@@ -42,13 +42,18 @@
defined(USE_AURA)
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
#endif
-@@ -601,14 +601,14 @@ const char* const kChromeHostURLs[] = {
+@@ -615,18 +615,18 @@ const char* const kChromeHostURLs[] = {
kChromeUIInternetDetailDialogHost,
kChromeUIAssistantOptInHost,
#endif
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS)
+ kChromeUIConnectorsInternalsHost,
+ #endif
+-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_CHROMEOS)
kChromeUIDiscardsHost,
#endif
#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID)
@@ -59,12 +64,3 @@
defined(OS_ANDROID)
kChromeUISandboxHost,
#endif
-@@ -671,7 +671,7 @@ const char* const kChromeDebugURLs[] = {
- blink::kChromeUIGpuJavaCrashURL,
- kChromeUIJavaCrashURL,
- #endif
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- kChromeUIWebUIJsErrorURL,
- #endif
- kChromeUIQuitURL,