Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(840)

Unified Diff: media/mojo/services/media_service.cc

Issue 2544523002: Pass Connector* into MojoMediaClient::Initialize(). (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/media_service.h ('k') | media/mojo/services/mojo_media_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/media_service.cc
diff --git a/media/mojo/services/media_service.cc b/media/mojo/services/media_service.cc
index 7463d27b7e90b5a14b27319ebe227ef7a5f21254..e1c5820e6a785cf43b6f5ea7d0a03f7885990ef6 100644
--- a/media/mojo/services/media_service.cc
+++ b/media/mojo/services/media_service.cc
@@ -29,7 +29,7 @@ void MediaService::OnStart() {
ref_factory_.reset(new service_manager::ServiceContextRefFactory(
base::Bind(&service_manager::ServiceContext::RequestQuit,
base::Unretained(context()))));
- mojo_media_client_->Initialize();
+ mojo_media_client_->Initialize(context()->connector());
}
bool MediaService::OnConnect(const service_manager::ServiceInfo& remote_info,
@@ -50,14 +50,14 @@ void MediaService::Create(const service_manager::Identity& remote_identity,
void MediaService::CreateInterfaceFactory(
mojom::InterfaceFactoryRequest request,
- service_manager::mojom::InterfaceProviderPtr remote_interfaces) {
+ service_manager::mojom::InterfaceProviderPtr host_interfaces) {
// Ignore request if service has already stopped.
if (!mojo_media_client_)
return;
mojo::MakeStrongBinding(
base::MakeUnique<InterfaceFactoryImpl>(
- std::move(remote_interfaces), media_log_, ref_factory_->CreateRef(),
+ std::move(host_interfaces), media_log_, ref_factory_->CreateRef(),
mojo_media_client_.get()),
std::move(request));
}
« no previous file with comments | « media/mojo/services/media_service.h ('k') | media/mojo/services/mojo_media_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698