diff options
Diffstat (limited to 'chromium/services/service_manager/embedder')
5 files changed, 5 insertions, 12 deletions
diff --git a/chromium/services/service_manager/embedder/main.cc b/chromium/services/service_manager/embedder/main.cc index f9c275cdd78..d277d1eea17 100644 --- a/chromium/services/service_manager/embedder/main.cc +++ b/chromium/services/service_manager/embedder/main.cc @@ -361,8 +361,7 @@ int Main(const MainParams& params) { mojo_config.is_broker_process = true; } mojo_config.max_message_num_bytes = kMaximumMojoMessageSize; - delegate->OverrideMojoConfiguration(&mojo_config); - mojo::core::Init(mojo_config); + delegate->InitializeMojo(&mojo_config); ui::RegisterPathProvider(); diff --git a/chromium/services/service_manager/embedder/main_delegate.cc b/chromium/services/service_manager/embedder/main_delegate.cc index 439504e5012..65dec35a7a6 100644 --- a/chromium/services/service_manager/embedder/main_delegate.cc +++ b/chromium/services/service_manager/embedder/main_delegate.cc @@ -24,8 +24,7 @@ ProcessType MainDelegate::OverrideProcessType() { return ProcessType::kDefault; } -void MainDelegate::OverrideMojoConfiguration( - mojo::core::Configuration* config) {} +void MainDelegate::InitializeMojo(mojo::core::Configuration* config) {} std::vector<Manifest> MainDelegate::GetServiceManifests() { return std::vector<Manifest>(); diff --git a/chromium/services/service_manager/embedder/main_delegate.h b/chromium/services/service_manager/embedder/main_delegate.h index 70f9a3ed232..abced50cb03 100644 --- a/chromium/services/service_manager/embedder/main_delegate.h +++ b/chromium/services/service_manager/embedder/main_delegate.h @@ -71,8 +71,9 @@ class COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER) MainDelegate { // return |ProcessType::kDefault| to avoid overriding. virtual ProcessType OverrideProcessType(); - // Allows the embedder to override the process-wide Mojop configuration. - virtual void OverrideMojoConfiguration(mojo::core::Configuration* config); + // Allows the embedder to override the process-wide Mojo configuration and + // initialization. + virtual void InitializeMojo(mojo::core::Configuration* config); // Gets the list of service manifests with which to initialize the Service // Manager. This list must describe the complete set of usable services in diff --git a/chromium/services/service_manager/embedder/switches.cc b/chromium/services/service_manager/embedder/switches.cc index 8337a14af77..7bc83d1a551 100644 --- a/chromium/services/service_manager/embedder/switches.cc +++ b/chromium/services/service_manager/embedder/switches.cc @@ -58,9 +58,6 @@ const char kServiceRequestChannelToken[] = "service-request-channel-token"; // global descriptor table. const char kSharedFiles[] = "shared-files"; -// The prefix used when starting the zygote process. (i.e. 'gdb --args') -const char kZygoteCmdPrefix[] = "zygote-cmd-prefix"; - // Causes the process to run as a zygote. const char kZygoteProcess[] = "zygote"; diff --git a/chromium/services/service_manager/embedder/switches.h b/chromium/services/service_manager/embedder/switches.h index 548165e5d12..3b6690aa501 100644 --- a/chromium/services/service_manager/embedder/switches.h +++ b/chromium/services/service_manager/embedder/switches.h @@ -38,9 +38,6 @@ COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER_SWITCHES) extern const char kSharedFiles[]; COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER_SWITCHES) -extern const char kZygoteCmdPrefix[]; - -COMPONENT_EXPORT(SERVICE_MANAGER_EMBEDDER_SWITCHES) extern const char kZygoteProcess[]; } // namespace switches |