From 47dc7a0b28e8ee8c7fe1f47318234be9b017f4aa Mon Sep 17 00:00:00 2001 From: "cpu@chromium.org" Date: Thu, 3 Dec 2009 03:56:22 +0000 Subject: Basic console output for diagnostics mode windows-only Also Wires --diagnostics to the diagnostics entry point start chrome with --diagnostics and watch pretty output BUG=27885 TEST= unit tests included Review URL: http://codereview.chromium.org/454020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33663 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/chrome_dll_main.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'chrome/app') diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index eafebb8..2217c8e 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -45,6 +45,7 @@ #include "base/stats_table.h" #include "base/string_util.h" #include "chrome/app/scoped_ole_initializer.h" +#include "chrome/browser/diagnostics/diagnostics_main.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_counters.h" @@ -353,6 +354,12 @@ int ChromeMain(int argc, char** argv) { std::string process_type = parsed_command_line.GetSwitchValueASCII(switches::kProcessType); + // If we are in diagnostics mode this is the end of the line. After the + // diagnostics are run the process will invariably exit. + if (parsed_command_line.HasSwitch(switches::kDiagnostics)) { + return DiagnosticsMain(parsed_command_line); + } + #if defined(OS_MACOSX) mac_util::SetOverrideAppBundlePath(chrome::GetFrameworkBundlePath()); #endif // OS_MACOSX -- cgit v1.1