summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content__browser__browser_main_loop.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-05-02 10:15:13 +0000
committerRene Ladan <rene@FreeBSD.org>2014-05-02 10:15:13 +0000
commit8a0cc5859cdaf1d7cc49c989b7ca2d2e39d02a3b (patch)
treeb9327265a8b513fe3d5d9fcb34065df9833d5491 /www/chromium/files/patch-content__browser__browser_main_loop.cc
parent- Allow "make package" as user (diff)
Update to 34.0.1847.132
Obtained from: https://github.com/gliaskos/freebsd-chromium/ MFH: 2014Q2 Security: http://vuxml.org/freebsd/7cf25a0c-d031-11e3-947b-00262d5ed8ee.html http://vuxml.org/freebsd/963413a5-bf50-11e3-a2d6-00262d5ed8ee.html
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.cc10
1 files changed, 5 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 3c49f82ff4f0..d9b8dc24c20f 100644
--- a/www/chromium/files/patch-content__browser__browser_main_loop.cc
+++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc
@@ -1,5 +1,5 @@
---- content/browser/browser_main_loop.cc.orig 2014-02-20 21:28:24.000000000 +0100
-+++ content/browser/browser_main_loop.cc 2014-02-24 20:28:45.000000000 +0100
+--- ./content/browser/browser_main_loop.cc.orig 2014-04-24 22:35:48.000000000 +0200
++++ ./content/browser/browser_main_loop.cc 2014-04-24 23:23:44.000000000 +0200
@@ -102,7 +102,7 @@
#include "ui/gfx/gtk_util.h"
#endif
@@ -9,7 +9,7 @@
#include <sys/stat.h>
#include "content/browser/renderer_host/render_sandbox_host_linux.h"
-@@ -125,7 +125,7 @@
+@@ -129,7 +129,7 @@
namespace content {
namespace {
@@ -18,7 +18,7 @@
void SetupSandbox(const CommandLine& parsed_command_line) {
TRACE_EVENT0("startup", "SetupSandbox");
// TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
-@@ -346,7 +346,7 @@
+@@ -353,7 +353,7 @@
void BrowserMainLoop::EarlyInitialization() {
TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
@@ -27,7 +27,7 @@
// No thread should be created before this call, as SetupSandbox()
// will end-up using fork().
SetupSandbox(parsed_command_line_);
-@@ -784,7 +784,7 @@
+@@ -777,7 +777,7 @@
}
#endif