Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Unified Diff: chrome/browser/browser_main.cc

Issue 112074: Linux: Add support for chrooted renderers. (Closed)
Patch Set: Created 11 years, 7 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
Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 84ab4f86fb0bcd8e193c6c0f38190dc3d9f0a1e8..118c1f3863f5882c275cefb9c8c0ff4464dc6ece 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -64,6 +64,7 @@
#if defined(OS_LINUX)
#include "chrome/app/breakpad_linux.h"
+#include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
#endif
// TODO(port): several win-only methods have been pulled out of this, but
@@ -218,6 +219,8 @@ void AddFirstRunNewTabs(BrowserInit* browser_init,
} // namespace
+extern void SkiaFontConfigUseDirectImplementation();
+
// Main routine for running as the Browser process.
int BrowserMain(const MainFunctionParams& parameters) {
const CommandLine& parsed_command_line = parameters.command_line_;
@@ -246,6 +249,17 @@ int BrowserMain(const MainFunctionParams& parameters) {
CHECK(sigaction(SIGCHLD, &action, NULL) == 0);
#endif
+#if defined(OS_LINUX)
+ EnableCrashDumping();
Evan Martin 2009/05/29 22:23:03 I think this needs to be conditional on the opt-in
+
agl 2009/05/29 22:26:59 Thanks. That was an artifact of merging. There sho
+ if (parsed_command_line.HasSwitch(switches::kLinuxSandbox)) {
+ // Construct the sandbox host on the UI thread.
+ Singleton<RenderSandboxHostLinux>::get();
+ }
+ // Configure Skia in this process to use fontconfig directly.
+ SkiaFontConfigUseDirectImplementation();
+#endif
+
// Do platform-specific things (such as finishing initializing Cocoa)
// prior to instantiating the message loop. This could be turned into a
// broadcast notification.

Powered by Google App Engine
This is Rietveld 408576698