OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "mojo/runner/desktop/main_helper.h" | 5 #include "mojo/runner/desktop/main_helper.h" |
6 | 6 |
7 | |
8 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
9 #include "base/base_switches.h" | 8 #include "base/base_switches.h" |
10 #include "base/command_line.h" | 9 #include "base/command_line.h" |
11 #include "base/debug/debugger.h" | 10 #include "base/debug/debugger.h" |
12 #include "base/debug/stack_trace.h" | |
13 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
14 #include "base/logging.h" | 12 #include "base/logging.h" |
15 #include "base/process/launch.h" | 13 #include "base/process/launch.h" |
16 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
17 #include "base/strings/string_split.h" | 15 #include "base/strings/string_split.h" |
18 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
19 #include "mojo/runner/desktop/launcher_process.h" | 17 #include "mojo/runner/desktop/launcher_process.h" |
20 #include "mojo/runner/host/child_process.h" | 18 #include "mojo/runner/host/child_process.h" |
21 #include "mojo/runner/host/switches.h" | 19 #include "mojo/runner/host/switches.h" |
22 #include "mojo/runner/init.h" | 20 #include "mojo/runner/init.h" |
(...skipping 12 matching lines...) Expand all Loading... | |
35 const base::Closure& callback) { | 33 const base::Closure& callback) { |
36 base::CommandLine::Init(argc, argv); | 34 base::CommandLine::Init(argc, argv); |
37 const base::CommandLine& command_line = | 35 const base::CommandLine& command_line = |
38 *base::CommandLine::ForCurrentProcess(); | 36 *base::CommandLine::ForCurrentProcess(); |
39 | 37 |
40 base::AtExitManager at_exit; | 38 base::AtExitManager at_exit; |
41 InitializeLogging(); | 39 InitializeLogging(); |
42 WaitForDebuggerIfNecessary(); | 40 WaitForDebuggerIfNecessary(); |
43 | 41 |
44 #if !defined(OFFICIAL_BUILD) | 42 #if !defined(OFFICIAL_BUILD) |
45 base::debug::EnableInProcessStackDumping(); | |
sadrul
2015/12/03 18:15:51
Remove this caused no backtrace when mus crashes.
| |
46 #if defined(OS_WIN) | 43 #if defined(OS_WIN) |
47 base::RouteStdioToConsole(false); | 44 base::RouteStdioToConsole(false); |
48 #endif | 45 #endif |
49 #endif | 46 #endif |
50 | 47 |
51 if (command_line.HasSwitch(switches::kChildProcess)) | 48 if (command_line.HasSwitch(switches::kChildProcess)) |
52 return ChildProcessMain(); | 49 return ChildProcessMain(); |
53 | 50 |
54 return LauncherProcessMain(mojo_url, callback); | 51 return LauncherProcessMain(mojo_url, callback); |
55 } | 52 } |
56 | 53 |
57 } // namespace runner | 54 } // namespace runner |
58 } // namespace mojo | 55 } // namespace mojo |
OLD | NEW |