diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-23 18:29:11 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-23 18:29:11 +0000 |
| commit | ee052b86770a2d1d269502dd6c903276024e7826 (patch) | |
| tree | e01b2e23116a733fb7b95130ae74b1abc60e6e84 /chrome/app/chrome_dll_main.cc | |
| parent | 3ae83989fbb4bc835109d709c4e71650f0788a14 (diff) | |
| download | chromium_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/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 0703fc3..de4d822 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -50,8 +50,6 @@ #endif #if defined(OS_MACOSX) #include "chrome/app/breakpad_mac.h" -#elif defined(OS_LINUX) -#include "chrome/app/breakpad_linux.h" #endif #include "chrome/app/scoped_ole_initializer.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -420,11 +418,6 @@ int ChromeMain(int argc, const char** argv) { if (!user_data_dir.empty()) CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); -#if defined(OS_LINUX) - // Needs to be called after we have chrome::DIR_USER_DATA. - InitCrashReporter(); -#endif - bool single_process = #if defined (GOOGLE_CHROME_BUILD) // This is an unsupported and not fully tested mode, so don't enable it for |