OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/shell/standalone/context.h" | 5 #include "services/shell/standalone/context.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <utility> | 10 #include <utility> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/files/file_path.h" | 15 #include "base/files/file_path.h" |
(...skipping 12 matching lines...) Expand all Loading... |
28 #include "build/build_config.h" | 28 #include "build/build_config.h" |
29 #include "components/tracing/tracing_switches.h" | 29 #include "components/tracing/tracing_switches.h" |
30 #include "mojo/edk/embedder/embedder.h" | 30 #include "mojo/edk/embedder/embedder.h" |
31 #include "mojo/public/cpp/bindings/strong_binding.h" | 31 #include "mojo/public/cpp/bindings/strong_binding.h" |
32 #include "mojo/services/catalog/factory.h" | 32 #include "mojo/services/catalog/factory.h" |
33 #include "mojo/services/catalog/store.h" | 33 #include "mojo/services/catalog/store.h" |
34 #include "mojo/services/tracing/public/cpp/switches.h" | 34 #include "mojo/services/tracing/public/cpp/switches.h" |
35 #include "mojo/services/tracing/public/cpp/trace_provider_impl.h" | 35 #include "mojo/services/tracing/public/cpp/trace_provider_impl.h" |
36 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 36 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
37 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" | 37 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" |
38 #include "mojo/shell/connect_params.h" | |
39 #include "mojo/shell/public/cpp/names.h" | |
40 #include "mojo/shell/runner/host/in_process_native_runner.h" | |
41 #include "mojo/shell/runner/host/out_of_process_native_runner.h" | |
42 #include "mojo/shell/standalone/tracer.h" | |
43 #include "mojo/shell/switches.h" | |
44 #include "mojo/util/filename_util.h" | 38 #include "mojo/util/filename_util.h" |
| 39 #include "services/shell/connect_params.h" |
| 40 #include "services/shell/public/cpp/names.h" |
| 41 #include "services/shell/runner/host/in_process_native_runner.h" |
| 42 #include "services/shell/runner/host/out_of_process_native_runner.h" |
| 43 #include "services/shell/standalone/tracer.h" |
| 44 #include "services/shell/switches.h" |
45 | 45 |
46 #if defined(OS_MACOSX) | 46 #if defined(OS_MACOSX) |
47 #include "mojo/shell/runner/host/mach_broker.h" | 47 #include "services/shell/runner/host/mach_broker.h" |
48 #endif | 48 #endif |
49 | 49 |
50 namespace mojo { | 50 namespace mojo { |
51 namespace shell { | 51 namespace shell { |
52 namespace { | 52 namespace { |
53 | 53 |
54 // Used to ensure we only init once. | 54 // Used to ensure we only init once. |
55 class Setup { | 55 class Setup { |
56 public: | 56 public: |
57 Setup() { edk::Init(); } | 57 Setup() { edk::Init(); } |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 scoped_ptr<ConnectParams> params(new ConnectParams); | 256 scoped_ptr<ConnectParams> params(new ConnectParams); |
257 params->set_source(CreateShellIdentity()); | 257 params->set_source(CreateShellIdentity()); |
258 params->set_target(Identity(name, mojom::kRootUserID)); | 258 params->set_target(Identity(name, mojom::kRootUserID)); |
259 params->set_remote_interfaces(GetProxy(&remote_interfaces)); | 259 params->set_remote_interfaces(GetProxy(&remote_interfaces)); |
260 params->set_local_interfaces(std::move(local_interfaces)); | 260 params->set_local_interfaces(std::move(local_interfaces)); |
261 shell_->Connect(std::move(params)); | 261 shell_->Connect(std::move(params)); |
262 } | 262 } |
263 | 263 |
264 } // namespace shell | 264 } // namespace shell |
265 } // namespace mojo | 265 } // namespace mojo |
OLD | NEW |