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/browser_main.cc | |
| 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/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 8a4e726..53eeadb 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -951,10 +951,8 @@ int BrowserMain(const MainFunctionParams& parameters) { CHECK(metrics_reporting_enabled); bool breakpad_enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled); - if (!breakpad_enabled && metrics_reporting_enabled->IsUserModifiable()) { - breakpad_enabled = (getenv(env_vars::kHeadless) != NULL) || - parsed_command_line.HasSwitch(switches::kEnableCrashReporter); - } + if (!breakpad_enabled && metrics_reporting_enabled->IsUserModifiable()) + breakpad_enabled = getenv(env_vars::kHeadless) != NULL; if (breakpad_enabled) InitCrashReporter(); #endif |