| 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 "services/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> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
| 22 #include "base/strings/string_split.h" | 22 #include "base/strings/string_split.h" |
| 23 #include "base/strings/string_util.h" | 23 #include "base/strings/string_util.h" |
| 24 #include "base/strings/utf_string_conversions.h" | 24 #include "base/strings/utf_string_conversions.h" |
| 25 #include "base/threading/sequenced_worker_pool.h" | 25 #include "base/threading/sequenced_worker_pool.h" |
| 26 #include "base/trace_event/trace_event.h" | 26 #include "base/trace_event/trace_event.h" |
| 27 #include "build/build_config.h" | 27 #include "build/build_config.h" |
| 28 #include "components/tracing/tracing_switches.h" | 28 #include "components/tracing/tracing_switches.h" |
| 29 #include "mojo/edk/embedder/embedder.h" | 29 #include "mojo/edk/embedder/embedder.h" |
| 30 #include "mojo/public/cpp/bindings/strong_binding.h" | 30 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 31 #include "mojo/util/filename_util.h" | |
| 32 #include "services/catalog/catalog.h" | 31 #include "services/catalog/catalog.h" |
| 33 #include "services/catalog/store.h" | 32 #include "services/catalog/store.h" |
| 34 #include "services/shell/connect_params.h" | 33 #include "services/shell/connect_params.h" |
| 35 #include "services/shell/public/cpp/names.h" | 34 #include "services/shell/public/cpp/names.h" |
| 36 #include "services/shell/runner/host/in_process_native_runner.h" | 35 #include "services/shell/runner/host/in_process_native_runner.h" |
| 37 #include "services/shell/runner/host/out_of_process_native_runner.h" | 36 #include "services/shell/runner/host/out_of_process_native_runner.h" |
| 38 #include "services/shell/standalone/tracer.h" | 37 #include "services/shell/standalone/tracer.h" |
| 39 #include "services/shell/switches.h" | 38 #include "services/shell/switches.h" |
| 40 #include "services/tracing/public/cpp/switches.h" | 39 #include "services/tracing/public/cpp/switches.h" |
| 41 #include "services/tracing/public/cpp/trace_provider_impl.h" | 40 #include "services/tracing/public/cpp/trace_provider_impl.h" |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 | 252 |
| 254 std::unique_ptr<ConnectParams> params(new ConnectParams); | 253 std::unique_ptr<ConnectParams> params(new ConnectParams); |
| 255 params->set_source(CreateShellIdentity()); | 254 params->set_source(CreateShellIdentity()); |
| 256 params->set_target(Identity(name, mojom::kRootUserID)); | 255 params->set_target(Identity(name, mojom::kRootUserID)); |
| 257 params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces)); | 256 params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces)); |
| 258 params->set_local_interfaces(std::move(local_interfaces)); | 257 params->set_local_interfaces(std::move(local_interfaces)); |
| 259 shell_->Connect(std::move(params)); | 258 shell_->Connect(std::move(params)); |
| 260 } | 259 } |
| 261 | 260 |
| 262 } // namespace shell | 261 } // namespace shell |
| OLD | NEW |