summaryrefslogtreecommitdiffstats
path: root/base/logging.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 21:53:05 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 21:53:05 +0000
commitbf97033addc8e72499652f64886ef89c7b062c39 (patch)
treec20ae214eb4ffe605e0292299e1e93935272e482 /base/logging.cc
parent8ffd052ba929d94eb587e4d55efc74557cd7454d (diff)
downloadchromium_src-bf97033addc8e72499652f64886ef89c7b062c39.zip
chromium_src-bf97033addc8e72499652f64886ef89c7b062c39.tar.gz
chromium_src-bf97033addc8e72499652f64886ef89c7b062c39.tar.bz2
Revert 70782 - Made logging not look up --enable-dcheck from command line
Made --enable-dcheck a parameter to InitLogging() and fixed up all callsites. BUG=62736 TEST=Manual Review URL: http://codereview.chromium.org/6070006 TBR=akalin@chromium.org Review URL: http://codereview.chromium.org/6100007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.cc')
-rw-r--r--base/logging.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/logging.cc b/base/logging.cc
index bdce7b3..cfb1065 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -64,7 +64,7 @@ typedef pthread_mutex_t* MutexHandle;
namespace logging {
-DcheckState g_dcheck_state = DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
+bool g_enable_dcheck = false;
VlogInfo* g_vlog_info = NULL;
const char* const log_severity_names[LOG_NUM_SEVERITIES] = {
@@ -353,10 +353,10 @@ bool InitializeLogFileHandle() {
bool BaseInitLoggingImpl(const PathChar* new_log_file,
LoggingDestination logging_dest,
LogLockingState lock_log,
- OldFileDeletionState delete_old,
- DcheckState dcheck_state) {
+ OldFileDeletionState delete_old) {
CommandLine* command_line = CommandLine::ForCurrentProcess();
- g_dcheck_state = dcheck_state;
+ g_enable_dcheck =
+ command_line->HasSwitch(switches::kEnableDCHECK);
delete g_vlog_info;
g_vlog_info = NULL;
// Don't bother initializing g_vlog_info unless we use one of the