diff options
author | Rene Ladan <rene@FreeBSD.org> | 2012-02-09 12:53:00 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2012-02-09 12:53:00 +0000 |
commit | a71930e2d98159f8096fd848dbc2f91a11bf2ed5 (patch) | |
tree | 13b26094f9b010645218f8e27cec640890893aca /www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc | |
parent | b6bea61efb01707070977edd7ecdae077bd33896 (diff) | |
download | ports-a71930e2d98159f8096fd848dbc2f91a11bf2ed5.tar.gz ports-a71930e2d98159f8096fd848dbc2f91a11bf2ed5.zip |
Update to 17.0.963.46
Obtained from: Chromium Chruetertee development repository
Security: http://www.vuxml.org/freebsd/fe1976c2-5317-11e1-9e99-00262d5ed8ee.html
Notes
Notes:
svn path=/head/; revision=290785
Diffstat (limited to 'www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc')
-rw-r--r-- | www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc new file mode 100644 index 000000000000..31cd2a46c9f4 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc @@ -0,0 +1,38 @@ +--- chrome/browser/ui/webui/about_ui.cc.orig 2012-02-01 20:07:00.000000000 +0200 ++++ chrome/browser/ui/webui/about_ui.cc 2012-02-01 20:07:54.000000000 +0200 +@@ -81,7 +81,7 @@ + #include "chrome/browser/chromeos/version_loader.h" + #include "chrome/browser/oom_priority_manager.h" + #include "content/browser/zygote_host_linux.h" +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "content/browser/zygote_host_linux.h" + #endif + +@@ -920,7 +920,7 @@ + return data; + } + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + std::string AboutLinuxProxyConfig() { + std::string data; + AppendHeader(&data, 0, +@@ -1306,7 +1306,7 @@ + return; + } else if (host == chrome::kChromeUIHistogramsHost) { + response = AboutHistograms(path); +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + } else if (host == chrome::kChromeUILinuxProxyConfigHost) { + response = AboutLinuxProxyConfig(); + #endif +@@ -1322,7 +1322,7 @@ + response = ResourceBundle::GetSharedInstance().GetRawDataResource( + IDR_OS_CREDITS_HTML).as_string(); + #endif +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + } else if (host == chrome::kChromeUISandboxHost) { + response = AboutSandbox(); + #endif |