From 41c2cd46aecd34eb258ed92b242ee86c333f06a8 Mon Sep 17 00:00:00 2001 From: "nsylvain@google.com" Date: Mon, 4 Aug 2008 23:26:34 +0000 Subject: Always enabled the crash reporting when crash_service.exe is used instead of Google Update. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@350 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/breakpad.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'chrome/app/breakpad.cc') diff --git a/chrome/app/breakpad.cc b/chrome/app/breakpad.cc index 26bafd7..83653d3 100644 --- a/chrome/app/breakpad.cc +++ b/chrome/app/breakpad.cc @@ -41,6 +41,7 @@ #include "base/string_util.h" #include "base/win_util.h" #include "chrome/app/google_update_client.h" +#include "chrome/app/google_update_settings.h" #include "breakpad/src/client/windows/handler/exception_handler.h" namespace { @@ -205,6 +206,15 @@ unsigned __stdcall InitCrashReporterThread(void* param) { if (use_crash_service) { pipe_name = kChromePipeName; } else { + // We want to use the Google Update crash reporting. We need to check if the + // user allows it first. + if (!GoogleUpdateSettings::GetCollectStatsConsent()) { + // The user did not allow Google Update to send crashes, we need to use + // our default crash handler instead. + InitDefaultCrashCallback(); + return 0; + } + // Build the pipe name. std::wstring user_sid; if (!win_util::GetUserSidString(&user_sid)) { -- cgit v1.1