diff options
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 | 26 |
1 files changed, 10 insertions, 16 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 7aff2b0742a8..ce0ddb6ec0d0 100644 --- a/www/chromium/files/patch-content__browser__browser_main_loop.cc +++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc @@ -1,15 +1,6 @@ ---- ./content/browser/browser_main_loop.cc.orig 2014-04-30 22:41:47.000000000 +0200 -+++ ./content/browser/browser_main_loop.cc 2014-05-04 14:38:47.000000000 +0200 -@@ -102,7 +102,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 "content/browser/renderer_host/render_sandbox_host_linux.h" -@@ -129,7 +129,7 @@ +--- ./content/browser/browser_main_loop.cc.orig 2014-08-12 21:01:25.000000000 +0200 ++++ ./content/browser/browser_main_loop.cc 2014-08-13 09:56:57.000000000 +0200 +@@ -135,7 +135,7 @@ namespace content { namespace { @@ -17,8 +8,8 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) void SetupSandbox(const CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); - // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this -@@ -353,7 +353,7 @@ + base::FilePath sandbox_binary; +@@ -336,7 +336,7 @@ void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); @@ -27,12 +18,15 @@ // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); -@@ -780,7 +780,7 @@ +@@ -762,9 +762,9 @@ } #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) ZygoteHostImpl::GetInstance()->TearDownAfterLastChild(); - #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + // The device monitors are using |system_monitor_| as dependency, so delete + // them before |system_monitor_| goes away. |