chrome/app/chrome_main.cc - Issue 7235023: Mac: Split SystemMonitor initialization so it's not blocked by the Sandbox.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/chrome_main.cc

Issue 7235023: Mac: Split SystemMonitor initialization so it's not blocked by the Sandbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Synced to trunk Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « base/system_monitor/system_monitor_unittest.cc ('k') | chrome/browser/extensions/extension_event_router_forwarder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/app/chrome_main.cc

diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc

index ed3827bf0d703370be3f7c387940cd65e9677ad6..79fcc62bf0179d4b7e9f72b6e509b40504e23469 100644

--- a/chrome/app/chrome_main.cc

+++ b/chrome/app/chrome_main.cc

@@ -60,6 +60,7 @@

#include "base/mac/mac_util.h"

#include "base/mac/os_crash_dumps.h"

#include "base/mach_ipc_mac.h"

+#include "base/system_monitor/system_monitor.h"

#include "chrome/app/breakpad_mac.h"

#include "chrome/browser/mac/relauncher.h"

#include "chrome/common/chrome_paths_internal.h"

@@ -568,6 +569,10 @@ int ChromeMain(int argc, char** argv) {

#if defined(OS_MACOSX)

chrome_main::SetUpBundleOverrides();

+ // We need to allocate the IO Ports before the Sandbox is initialized or

+ // the first instance of SystemMonitor is created.

+ base::SystemMonitor::AllocateSystemIOPorts();

#endif

CommandLine::Init(argc, argv);