summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_dll_main.cc7
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