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 <stdio.h> | 5 #include <stdio.h> |
6 #include <string.h> | 6 #include <string.h> |
7 | 7 |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <iostream> | 9 #include <iostream> |
10 | 10 |
11 #include "base/base_switches.h" | 11 #include "base/base_switches.h" |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/files/file_util.h" | 14 #include "base/files/file_util.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
| 16 #include "base/path_service.h" |
16 #include "base/synchronization/waitable_event.h" | 17 #include "base/synchronization/waitable_event.h" |
17 #include "base/trace_event/trace_event.h" | 18 #include "base/trace_event/trace_event.h" |
18 #include "components/tracing/trace_config_file.h" | 19 #include "components/tracing/trace_config_file.h" |
19 #include "components/tracing/tracing_switches.h" | 20 #include "components/tracing/tracing_switches.h" |
20 #include "mandoline/app/core_services_initialization.h" | 21 #include "mandoline/app/core_services_initialization.h" |
21 #include "mandoline/app/desktop/launcher_process.h" | 22 #include "mandoline/app/desktop/launcher_process.h" |
22 #include "mojo/runner/context.h" | 23 #include "mojo/runner/context.h" |
23 #include "mojo/runner/switches.h" | 24 #include "mojo/runner/switches.h" |
24 | 25 |
25 namespace mandoline { | 26 namespace mandoline { |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 trace_config, base::trace_event::TraceLog::RECORDING_MODE); | 93 trace_config, base::trace_event::TraceLog::RECORDING_MODE); |
93 } else if (tracing::TraceConfigFile::GetInstance()->IsEnabled()) { | 94 } else if (tracing::TraceConfigFile::GetInstance()->IsEnabled()) { |
94 g_tracing = true; | 95 g_tracing = true; |
95 base::trace_event::TraceLog::GetInstance()->SetEnabled( | 96 base::trace_event::TraceLog::GetInstance()->SetEnabled( |
96 tracing::TraceConfigFile::GetInstance()->GetTraceConfig(), | 97 tracing::TraceConfigFile::GetInstance()->GetTraceConfig(), |
97 base::trace_event::TraceLog::RECORDING_MODE); | 98 base::trace_event::TraceLog::RECORDING_MODE); |
98 } | 99 } |
99 | 100 |
100 // We want the runner::Context to outlive the MessageLoop so that pipes are | 101 // We want the runner::Context to outlive the MessageLoop so that pipes are |
101 // all gracefully closed / error-out before we try to shut the Context down. | 102 // all gracefully closed / error-out before we try to shut the Context down. |
102 mojo::runner::Context shell_context; | 103 base::FilePath shell_dir; |
| 104 PathService::Get(base::DIR_MODULE, &shell_dir); |
| 105 mojo::runner::Context shell_context(shell_dir); |
103 InitCoreServicesForContext(&shell_context); | 106 InitCoreServicesForContext(&shell_context); |
104 { | 107 { |
105 base::MessageLoop message_loop; | 108 base::MessageLoop message_loop; |
106 if (!shell_context.Init()) { | 109 if (!shell_context.Init()) { |
107 return 0; | 110 return 0; |
108 } | 111 } |
109 if (g_tracing) { | 112 if (g_tracing) { |
110 message_loop.PostDelayedTask(FROM_HERE, | 113 message_loop.PostDelayedTask(FROM_HERE, |
111 base::Bind(StopTracingAndFlushToDisk), | 114 base::Bind(StopTracingAndFlushToDisk), |
112 base::TimeDelta::FromSeconds(5)); | 115 base::TimeDelta::FromSeconds(5)); |
113 } | 116 } |
114 | 117 |
115 message_loop.PostTask(FROM_HERE, | 118 message_loop.PostTask(FROM_HERE, |
116 base::Bind(&mojo::runner::Context::Run, | 119 base::Bind(&mojo::runner::Context::Run, |
117 base::Unretained(&shell_context), | 120 base::Unretained(&shell_context), |
118 GURL("mojo:desktop_ui"))); | 121 GURL("mojo:desktop_ui"))); |
119 message_loop.Run(); | 122 message_loop.Run(); |
120 | 123 |
121 // Must be called before |message_loop| is destroyed. | 124 // Must be called before |message_loop| is destroyed. |
122 shell_context.Shutdown(); | 125 shell_context.Shutdown(); |
123 } | 126 } |
124 | 127 |
125 if (g_tracing) | 128 if (g_tracing) |
126 StopTracingAndFlushToDisk(); | 129 StopTracingAndFlushToDisk(); |
127 return 0; | 130 return 0; |
128 } | 131 } |
129 | 132 |
130 } // namespace mandoline | 133 } // namespace mandoline |
OLD | NEW |