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

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

Issue 1466633002: media: Add ProvisionFetcher mojo interface and implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix std::move use Created 5 years, 1 month 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/mojo_media_client.h ('k') | media/mojo/services/mojo_provision_fetcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_media_client.cc
diff --git a/media/mojo/services/mojo_media_client.cc b/media/mojo/services/mojo_media_client.cc
index 7501b5dc884a89aefb3acb7adeef1f3047144b74..d59214f43f3ba69ad24f844de8c63dfe7c6ff8d1 100644
--- a/media/mojo/services/mojo_media_client.cc
+++ b/media/mojo/services/mojo_media_client.cc
@@ -41,7 +41,8 @@ const AudioHardwareConfig* PlatformMojoMediaClient::GetAudioHardwareConfig() {
return nullptr;
}
-scoped_ptr<CdmFactory> PlatformMojoMediaClient::CreateCdmFactory() {
+scoped_ptr<CdmFactory> PlatformMojoMediaClient::CreateCdmFactory(
+ mojo::ServiceProvider* service_provider) {
return nullptr;
}
@@ -87,12 +88,13 @@ const AudioHardwareConfig* MojoMediaClient::GetAudioHardwareConfig() {
return mojo_media_client_->GetAudioHardwareConfig();
}
-scoped_ptr<CdmFactory> MojoMediaClient::CreateCdmFactory() {
- return mojo_media_client_->CreateCdmFactory();
+scoped_ptr<CdmFactory> MojoMediaClient::CreateCdmFactory(
+ mojo::ServiceProvider* service_provider) {
+ return mojo_media_client_->CreateCdmFactory(service_provider);
}
MojoMediaClient::MojoMediaClient()
- : mojo_media_client_(internal::CreatePlatformMojoMediaClient().Pass()) {
+ : mojo_media_client_(internal::CreatePlatformMojoMediaClient()) {
DCHECK(mojo_media_client_);
}
« no previous file with comments | « media/mojo/services/mojo_media_client.h ('k') | media/mojo/services/mojo_provision_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698