summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 04:50:32 +0000
committerjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 04:50:32 +0000
commitd2af1f012ef1a9b5c0300f0296f4df0316a62499 (patch)
tree8a28bb8d867752bfe960130cced33676e493f2ca
parent4f91d3024b65034841cd59a1a8f6975220e198c0 (diff)
downloadchromium_src-d2af1f012ef1a9b5c0300f0296f4df0316a62499.zip
chromium_src-d2af1f012ef1a9b5c0300f0296f4df0316a62499.tar.gz
chromium_src-d2af1f012ef1a9b5c0300f0296f4df0316a62499.tar.bz2
content_shell: always initialize logging.
Previously, logging was only initialized for --dump-render-tree. BUG=145147 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10879111 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153859 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/shell/shell_main_delegate.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index 53a2170..f226c91 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -57,7 +57,7 @@ void InitLogging() {
log_filename = log_filename.AppendASCII("content_shell.log");
logging::InitLogging(
log_filename.value().c_str(),
- logging::LOG_ONLY_TO_FILE,
+ logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
logging::LOCK_LOG_FILE,
logging::DELETE_OLD_LOG_FILE,
logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
@@ -83,8 +83,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
logging::LogEventProvider::Initialize(kContentShellProviderName);
#endif
+ InitLogging();
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
- InitLogging();
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowFileAccessFromFiles);
}