diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2012-05-28 22:29:08 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2012-05-28 22:29:08 +0000 |
| commit | 3b94bb84806f74d78187a018ec3155a6bd6cb195 (patch) | |
| tree | e2842b0137a784e2bf8527a29936c01f051d31c3 /www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc | |
| parent | 3676146ac4ffb6a5006ea1c5682f740dee6ef6a2 (diff) | |
| download | ports-3b94bb84806f74d78187a018ec3155a6bd6cb195.tar.gz ports-3b94bb84806f74d78187a018ec3155a6bd6cb195.zip | |
Update to 19.0.1084.52
Note that this version will not yet build on i386 boxes without (S)SSE3.
Submitted by: George Liaskos
Security: http://www.vuxml.org/freebsd/1449af37-9eba-11e1-b9c1-00262d5ed8ee.html
Notes
Notes:
svn path=/head/; revision=297628
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 | 16 |
1 files changed, 8 insertions, 8 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 index 31cd2a46c9f4..e5c1dc89ffe2 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc @@ -1,15 +1,15 @@ ---- 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 @@ +--- chrome/browser/ui/webui/about_ui.cc.orig 2012-04-25 10:02:26.000000000 +0300 ++++ chrome/browser/ui/webui/about_ui.cc 2012-04-29 20:28:24.000000000 +0300 +@@ -82,7 +82,7 @@ #include "chrome/browser/chromeos/version_loader.h" #include "chrome/browser/oom_priority_manager.h" - #include "content/browser/zygote_host_linux.h" + #include "content/public/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" + #include "content/public/browser/zygote_host_linux.h" #endif -@@ -920,7 +920,7 @@ +@@ -1044,7 +1044,7 @@ return data; } @@ -18,7 +18,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -1306,7 +1306,7 @@ +@@ -1439,7 +1439,7 @@ return; } else if (host == chrome::kChromeUIHistogramsHost) { response = AboutHistograms(path); @@ -27,7 +27,7 @@ } else if (host == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif -@@ -1322,7 +1322,7 @@ +@@ -1455,7 +1455,7 @@ response = ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_OS_CREDITS_HTML).as_string(); #endif |