diff options
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.cc | 28 |
1 files changed, 15 insertions, 13 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 7ce98cde6a54..971ae6aaed4a 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-01-18 21:28:52 UTC +--- chrome/common/webui_url_constants.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/common/webui_url_constants.cc -@@ -339,12 +339,12 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -343,12 +343,12 @@ bool IsSystemWebUIHost(base::StringPiece host) { } - #endif // defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - const char kChromeUIWebUIJsExceptionHost[] = "webuijsexception"; - const char kChromeUIWebUIJsExceptionURL[] = "chrome://webuijsexception/"; + const char kChromeUIWebUIJsErrorHost[] = "webuijserror"; + const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; #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/"; -@@ -361,13 +361,13 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb +@@ -365,7 +365,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -24,14 +24,16 @@ defined(OS_ANDROID) const char kChromeUISandboxHost[] = "sandbox"; #endif - +@@ -373,7 +373,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_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIProfileCustomizationHost[] = "profile-customization"; -@@ -378,7 +378,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -384,7 +384,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -40,7 +42,7 @@ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -549,14 +549,14 @@ const char* const kChromeHostURLs[] = { +@@ -553,14 +553,14 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif @@ -57,12 +59,12 @@ defined(OS_ANDROID) kChromeUISandboxHost, #endif -@@ -615,7 +615,7 @@ const char* const kChromeDebugURLs[] = { +@@ -619,7 +619,7 @@ const char* const kChromeDebugURLs[] = { content::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - kChromeUIWebUIJsExceptionURL, + kChromeUIWebUIJsErrorURL, #endif kChromeUIQuitURL, |