diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2012-11-08 00:10:16 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2012-11-08 00:10:16 +0000 |
| commit | a89620b14e23bc9532b361715d0395b31c78787b (patch) | |
| tree | 3e331bf3857b2bf1da38dd857be82d0bf9419af7 /www/chromium/files/patch-content__browser__browser_main_loop.cc | |
| parent | - forgot to remove a file in the last update. (diff) | |
Update to 23.0.1271.64
Submitted by: George Liaskos
Security: http://www.vuxml.org/freebsd/209c068d-28be-11e2-9160-00262d5ed8ee.html
Feature safe: yes
Diffstat (limited to 'www/chromium/files/patch-content__browser__browser_main_loop.cc')
| -rw-r--r-- | www/chromium/files/patch-content__browser__browser_main_loop.cc | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc index 90ba548041d4..545501f3d347 100644 --- a/www/chromium/files/patch-content__browser__browser_main_loop.cc +++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2012-01-30 22:18:23.000000000 +0200 -+++ content/browser/browser_main_loop.cc 2012-01-30 22:19:06.000000000 +0200 -@@ -39,7 +39,7 @@ +--- content/browser/browser_main_loop.cc.orig 2012-10-31 21:01:35.000000000 +0200 ++++ content/browser/browser_main_loop.cc 2012-11-07 15:40:53.000000000 +0200 +@@ -61,7 +61,7 @@ #include "net/base/winsock_init.h" #endif @@ -9,7 +9,25 @@ #include <glib-object.h> #endif -@@ -89,7 +89,7 @@ +@@ -79,7 +79,7 @@ + #include "ui/gfx/gtk_util.h" + #endif + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + #include <sys/stat.h> + + #include "base/process_util.h" +@@ -100,7 +100,7 @@ + + namespace { + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + void SetupSandbox(const CommandLine& parsed_command_line) { + // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this + // code en masse out of chrome_main for now. +@@ -128,7 +128,7 @@ } #endif @@ -18,7 +36,16 @@ static void GLibLogHandler(const gchar* log_domain, GLogLevelFlags log_level, const gchar* message, -@@ -518,7 +518,7 @@ +@@ -286,7 +286,7 @@ + } + #endif // !defined(USE_OPENSSL) + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + SetupSandbox(parsed_command_line_); + #endif + +@@ -681,7 +681,7 @@ // are no #else branches on any #ifs. // TODO(stevenjb): Move platform specific code into platform specific Parts // (Need to add InitializeToolkit stage to BrowserParts). |