| 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/service_manager/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 "base/strings/utf_string_conversions.h" | 28 #include "base/strings/utf_string_conversions.h" |
| 29 #include "base/threading/sequenced_worker_pool.h" | 29 #include "base/threading/sequenced_worker_pool.h" |
| 30 #include "base/threading/thread_task_runner_handle.h" | 30 #include "base/threading/thread_task_runner_handle.h" |
| 31 #include "base/trace_event/trace_event.h" | 31 #include "base/trace_event/trace_event.h" |
| 32 #include "build/build_config.h" | 32 #include "build/build_config.h" |
| 33 #include "components/tracing/common/tracing_switches.h" | 33 #include "components/tracing/common/tracing_switches.h" |
| 34 #include "mojo/edk/embedder/embedder.h" | 34 #include "mojo/edk/embedder/embedder.h" |
| 35 #include "mojo/public/cpp/bindings/strong_binding.h" | 35 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 36 #include "services/catalog/catalog.h" | 36 #include "services/catalog/catalog.h" |
| 37 #include "services/catalog/store.h" | 37 #include "services/catalog/store.h" |
| 38 #include "services/shell/connect_params.h" | 38 #include "services/service_manager/connect_params.h" |
| 39 #include "services/shell/public/cpp/names.h" | 39 #include "services/service_manager/public/cpp/names.h" |
| 40 #include "services/shell/runner/common/switches.h" | 40 #include "services/service_manager/runner/common/switches.h" |
| 41 #include "services/shell/runner/host/in_process_native_runner.h" | 41 #include "services/service_manager/runner/host/in_process_native_runner.h" |
| 42 #include "services/shell/runner/host/out_of_process_native_runner.h" | 42 #include "services/service_manager/runner/host/out_of_process_native_runner.h" |
| 43 #include "services/shell/standalone/tracer.h" | 43 #include "services/service_manager/standalone/tracer.h" |
| 44 #include "services/shell/switches.h" | 44 #include "services/service_manager/switches.h" |
| 45 #include "services/tracing/public/cpp/provider.h" | 45 #include "services/tracing/public/cpp/provider.h" |
| 46 #include "services/tracing/public/cpp/switches.h" | 46 #include "services/tracing/public/cpp/switches.h" |
| 47 #include "services/tracing/public/interfaces/tracing.mojom.h" | 47 #include "services/tracing/public/interfaces/tracing.mojom.h" |
| 48 | 48 |
| 49 #if defined(OS_MACOSX) | 49 #if defined(OS_MACOSX) |
| 50 #include "services/shell/runner/host/mach_broker.h" | 50 #include "services/service_manager/runner/host/mach_broker.h" |
| 51 #endif | 51 #endif |
| 52 | 52 |
| 53 namespace shell { | 53 namespace shell { |
| 54 namespace { | 54 namespace { |
| 55 | 55 |
| 56 base::FilePath::StringType GetPathFromCommandLineSwitch( | 56 base::FilePath::StringType GetPathFromCommandLineSwitch( |
| 57 const base::StringPiece& value) { | 57 const base::StringPiece& value) { |
| 58 #if defined(OS_POSIX) | 58 #if defined(OS_POSIX) |
| 59 return value.as_string(); | 59 return value.as_string(); |
| 60 #elif defined(OS_WIN) | 60 #elif defined(OS_WIN) |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 mojom::InterfaceProviderPtr local_interfaces; | 286 mojom::InterfaceProviderPtr local_interfaces; |
| 287 | 287 |
| 288 std::unique_ptr<ConnectParams> params(new ConnectParams); | 288 std::unique_ptr<ConnectParams> params(new ConnectParams); |
| 289 params->set_source(CreateServiceManagerIdentity()); | 289 params->set_source(CreateServiceManagerIdentity()); |
| 290 params->set_target(Identity(name, mojom::kRootUserID)); | 290 params->set_target(Identity(name, mojom::kRootUserID)); |
| 291 params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces)); | 291 params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces)); |
| 292 service_manager_->Connect(std::move(params)); | 292 service_manager_->Connect(std::move(params)); |
| 293 } | 293 } |
| 294 | 294 |
| 295 } // namespace shell | 295 } // namespace shell |
| OLD | NEW |