Page MenuHomeFreeBSD
Differential D23984 Diff 69292 www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc

Changeset View

Standalone View

View Options

www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc

--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-12-16 21:51:24 UTC --- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-03-03 18:53:52 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -206,11 +206,11 @@ @@ -215,11 +215,11 @@
#include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
#endif #endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/discards_ui.h"
#endif #endif
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
#include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
#endif #endif
@@ -308,7 +308,7 @@ bool IsAboutUI(const GURL& url) { @@ -328,7 +328,7 @@ bool IsAboutUI(const GURL& url) {
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost || url.host_piece() == chrome::kChromeUITermsHost
#endif #endif
-#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)
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif #endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
@@ -621,7 +621,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we @@ -658,7 +658,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost) if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>; return &NewWebUI<NaClUI>;
#endif #endif
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) || defined(OS_BSD) +#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) || defined(OS_BSD)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
return &NewWebUI<ConstrainedWebDialogUI>; return &NewWebUI<ConstrainedWebDialogUI>;
#endif #endif
@@ -669,17 +669,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we @@ -706,17 +706,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<CastUI>; return &NewWebUI<CastUI>;
} }
#endif #endif
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
if (url.host_piece() == chrome::kChromeUISandboxHost) { if (url.host_piece() == chrome::kChromeUISandboxHost) {
return &NewWebUI<SandboxInternalsUI>; return &NewWebUI<SandboxInternalsUI>;
} }
Show All 12 Lines