Changeset View
Changeset View
Standalone View
Standalone View
www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
| --- chrome/browser/ui/webui/about_ui.cc.orig 2019-12-16 21:51:24 UTC | --- chrome/browser/ui/webui/about_ui.cc.orig 2020-03-03 18:53:52 UTC | ||||
| +++ chrome/browser/ui/webui/about_ui.cc | +++ chrome/browser/ui/webui/about_ui.cc | ||||
| @@ -562,7 +562,7 @@ std::string ChromeURLs() { | @@ -561,7 +561,7 @@ std::string ChromeURLs() { | ||||
| return html; | return html; | ||||
| } | } | ||||
| -#if defined(OS_LINUX) || defined(OS_OPENBSD) | -#if defined(OS_LINUX) || defined(OS_OPENBSD) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| std::string AboutLinuxProxyConfig() { | std::string AboutLinuxProxyConfig() { | ||||
| std::string data; | std::string data; | ||||
| AppendHeader(&data, 0, | AppendHeader(&data, 0, | ||||
| @@ -616,7 +616,7 @@ void AboutUIHTMLSource::StartDataRequest( | @@ -617,7 +617,7 @@ void AboutUIHTMLSource::StartDataRequest( | ||||
| response = | response = | ||||
| ui::ResourceBundle::GetSharedInstance().DecompressDataResource(idr); | ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); | ||||
| } | } | ||||
| -#if defined(OS_LINUX) || defined(OS_OPENBSD) | -#if defined(OS_LINUX) || defined(OS_OPENBSD) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { | } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { | ||||
| response = AboutLinuxProxyConfig(); | response = AboutLinuxProxyConfig(); | ||||
| #endif | #endif | ||||