diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 03:56:22 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 03:56:22 +0000 |
| commit | 47dc7a0b28e8ee8c7fe1f47318234be9b017f4aa (patch) | |
| tree | 2f32800b4f027020a17c068dd279bb011e7e7617 /chrome/app | |
| parent | 187a031308c1ffcc8eb6f9d1392332be3e246b78 (diff) | |
| download | chromium_src-47dc7a0b28e8ee8c7fe1f47318234be9b017f4aa.zip chromium_src-47dc7a0b28e8ee8c7fe1f47318234be9b017f4aa.tar.gz chromium_src-47dc7a0b28e8ee8c7fe1f47318234be9b017f4aa.tar.bz2 | |
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
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 7 |
1 files changed, 7 insertions, 0 deletions
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 |