diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_common_webui__url__constants.h')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_webui__url__constants.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index a670a1c664e5..eb2ea952c41a 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,13 +1,13 @@ ---- chrome/common/webui_url_constants.h.orig 2021-01-18 21:28:52 UTC +--- chrome/common/webui_url_constants.h.orig 2021-03-12 23:57:19 UTC +++ chrome/common/webui_url_constants.h -@@ -292,12 +292,12 @@ bool IsSystemWebUIHost(base::StringPiece host); +@@ -295,12 +295,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) - extern const char kChromeUIWebUIJsExceptionHost[]; - extern const char kChromeUIWebUIJsExceptionURL[]; + extern const char kChromeUIWebUIJsErrorHost[]; + extern const char kChromeUIWebUIJsErrorURL[]; #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ @@ -15,7 +15,7 @@ defined(OS_CHROMEOS) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; -@@ -314,13 +314,13 @@ extern const char kChromeUINearbyShareURL[]; +@@ -317,7 +317,7 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif @@ -24,14 +24,16 @@ defined(OS_ANDROID) extern const char kChromeUISandboxHost[]; #endif - +@@ -325,7 +325,7 @@ extern const char kChromeUISandboxHost[]; + // 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) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIProfileCustomizationHost[]; -@@ -330,7 +330,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -335,7 +335,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif |