diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 09:01:42 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 09:01:42 +0000 |
| commit | ebb84b2d96cb19aaa5349d92d1b2590dd09a93a0 (patch) | |
| tree | caa88d0772d9ada0d33219500d5f356355c5a14f /chrome/browser/google | |
| parent | 3555843c741b40810cc262f8e4d53b0e6c403401 (diff) | |
| download | chromium_src-ebb84b2d96cb19aaa5349d92d1b2590dd09a93a0.zip chromium_src-ebb84b2d96cb19aaa5349d92d1b2590dd09a93a0.tar.gz chromium_src-ebb84b2d96cb19aaa5349d92d1b2590dd09a93a0.tar.bz2 | |
Remove --enable-crash-reporter check from google_update_settings_posix.cc
Original CL (with LGTM) 3408002.
BUG=55193
TEST=On Mac/Linux: Start with crash reporting enabled, turn it off through preferences, open a new tab and load about:crash, quit chrome, restart chrome, load about:crash -> no crash report should be generated.
Review URL: http://codereview.chromium.org/3497010
Patch from Mattias Nissler <mnissler@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google')
| -rw-r--r-- | chrome/browser/google/google_update_settings_posix.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/google/google_update_settings_posix.cc b/chrome/browser/google/google_update_settings_posix.cc index dbc6f1f..242407c 100644 --- a/chrome/browser/google/google_update_settings_posix.cc +++ b/chrome/browser/google/google_update_settings_posix.cc @@ -4,12 +4,10 @@ #include "chrome/installer/util/google_update_settings.h" -#include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/chrome_switches.h" namespace google_update { std::string posix_guid; @@ -20,16 +18,14 @@ static const char kConsentToSendStats[] = "Consent To Send Stats"; // static bool GoogleUpdateSettings::GetCollectStatsConsent() { - bool forced_enable = CommandLine::ForCurrentProcess()-> - HasSwitch(switches::kEnableCrashReporter); FilePath consent_file; PathService::Get(chrome::DIR_USER_DATA, &consent_file); consent_file = consent_file.Append(kConsentToSendStats); std::string tmp_guid; bool consented = file_util::ReadFileToString(consent_file, &tmp_guid); - if (forced_enable || consented) + if (consented) google_update::posix_guid.assign(tmp_guid); - return forced_enable || consented; + return consented; } // static |