diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 20:23:06 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 20:23:06 +0000 |
| commit | 1e7377df1449c4e543a50c8a8a1425599c8425f7 (patch) | |
| tree | 6e8ee3adcba66e4a043e91e91e0217467682a7fd /chrome/app/chrome_dll_main.cc | |
| parent | 34cf340da15aceffd59c3d05e0de2a3bc5174a2d (diff) | |
| download | chromium_src-1e7377df1449c4e543a50c8a8a1425599c8425f7.zip chromium_src-1e7377df1449c4e543a50c8a8a1425599c8425f7.tar.gz chromium_src-1e7377df1449c4e543a50c8a8a1425599c8425f7.tar.bz2 | |
Respect Linux user prefs with regards to crash reporting.
This involves implementing GoogleUpdateSettings::[GS]etCollectStatsConsent, and a whole lot of refactoring.
BUG=none
TEST=delete config dir, run official Linux build, don't enable crash reporting, crash browser -> no crash reporting.
Review URL: http://codereview.chromium.org/115808
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 69487b6..006d923 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -47,6 +47,8 @@ #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" @@ -302,7 +304,7 @@ int ChromeMain(int argc, const char** argv) { const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); #if defined(OS_WIN) - // Must do this before any other usage of command line! + // Must do this before any other usage of command line! if (HasDeprecatedArguments(parsed_command_line.command_line_string())) return 1; #endif @@ -392,6 +394,11 @@ 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 + #if defined(OS_POSIX) // Bug 11776: we mistakenly created directories world-readable. // Fix old instances of these directories manually. |