diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 02:38:39 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 02:38:39 +0000 |
| commit | d0ba2c2d1f8180150f11be94424112c5562d70e0 (patch) | |
| tree | 3aa13767307db0ce15bbd2c026f302e64058bfa9 /chrome | |
| parent | 0195cd569f7dc020c1667b10075025f15620b072 (diff) | |
| download | chromium_src-d0ba2c2d1f8180150f11be94424112c5562d70e0.zip chromium_src-d0ba2c2d1f8180150f11be94424112c5562d70e0.tar.gz chromium_src-d0ba2c2d1f8180150f11be94424112c5562d70e0.tar.bz2 | |
Pass Linux crash guid to renderers.
Review URL: http://codereview.chromium.org/149736
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/breakpad_linux.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index beaae2c..2f75d0a 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -18,6 +18,7 @@ #include "base/global_descriptors_posix.h" #include "base/path_service.h" #include "base/rand_util.h" +#include "base/string_util.h" #include "breakpad/linux/directory_reader.h" #include "breakpad/linux/exception_handler.h" #include "breakpad/linux/linux_libc_support.h" @@ -552,6 +553,8 @@ void InitCrashReporter() { // dir. Instead, we set a command line flag for these processes. if (!parsed_command_line.HasSwitch(switches::kRendererCrashDump)) return; + google_update::linux_guid = WideToASCII( + parsed_command_line.GetSwitchValue(switches::kRendererCrashDump)); EnableRendererCrashDumping(); } } diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 9c435d3..b18e729 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -125,6 +125,15 @@ class RendererMainThread : public base::Thread { }; +#if defined(OS_LINUX) +// This is defined in chrome/browser/google_update_settings_linux.cc, it's the +// static string containing the user's unique GUID. We send this in the crash +// report. +namespace google_update { +extern std::string linux_guid; +} +#endif + // Size of the buffer after which individual link updates deemed not warranted // and the overall update should be used instead. static const unsigned kVisitedLinkBufferThreshold = 50; @@ -392,7 +401,8 @@ bool BrowserRenderProcessHost::Init() { #if defined(OS_LINUX) if (GoogleUpdateSettings::GetCollectStatsConsent()) - cmd_line.AppendSwitch(switches::kRendererCrashDump); + cmd_line.AppendSwitchWithValue(switches::kRendererCrashDump, + ASCIIToWide(google_update::linux_guid)); #endif cmd_line.AppendSwitchWithValue(switches::kProcessType, |