summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/renderer_main.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 18:29:11 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 18:29:11 +0000
commitee052b86770a2d1d269502dd6c903276024e7826 (patch)
treee01b2e23116a733fb7b95130ae74b1abc60e6e84 /chrome/renderer/renderer_main.cc
parent3ae83989fbb4bc835109d709c4e71650f0788a14 (diff)
downloadchromium_src-ee052b86770a2d1d269502dd6c903276024e7826.zip
chromium_src-ee052b86770a2d1d269502dd6c903276024e7826.tar.gz
chromium_src-ee052b86770a2d1d269502dd6c903276024e7826.tar.bz2
Linux: fix crash reporting for zygote model
Crash reporting broke on Linux when we enabled the zygote model a couple of weeks ago. We can't just add "zygote" to the check for the process type because the crash signal fd is set at the same time and that will change when a renderer is forked from the zygote. This fixes it for now, but it will need to be redone when we enable sandboxing. http://codereview.chromium.org/147004 BUG=14969 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_main.cc')
-rw-r--r--chrome/renderer/renderer_main.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc
index 03e731f..55ca339 100644
--- a/chrome/renderer/renderer_main.cc
+++ b/chrome/renderer/renderer_main.cc
@@ -25,6 +25,10 @@
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
+#if defined(OS_LINUX)
+#include "chrome/app/breakpad_linux.h"
+#endif
+
// This function provides some ways to test crash and assertion handling
// behavior of the renderer.
static void HandleRendererErrorTestParameters(const CommandLine& command_line) {
@@ -64,6 +68,11 @@ int RendererMain(const MainFunctionParams& parameters) {
const CommandLine& parsed_command_line = parameters.command_line_;
base::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
+#if defined(OS_LINUX)
+ // Needs to be called after we have chrome::DIR_USER_DATA.
+ InitCrashReporter();
+#endif
+
// This function allows pausing execution using the --renderer-startup-dialog
// flag allowing us to attach a debugger.
// Do not move this function down since that would mean we can't easily debug