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

Unified Diff: media/mojo/services/mojo_renderer_service.h

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed 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/mojo_decryptor_service.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_service.h
diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h
index d0e03a26028fe7695ab86e42a75bdf5daaed97a6..c088d5936d070cd098feb2b01f77b3cd0ccabbbb 100644
--- a/media/mojo/services/mojo_renderer_service.h
+++ b/media/mojo/services/mojo_renderer_service.h
@@ -27,7 +27,7 @@ namespace media {
class AudioRendererSink;
class DemuxerStreamProviderShim;
-class MediaKeys;
+class ContentDecryptionModule;
class MojoCdmServiceContext;
class Renderer;
class VideoRendererSink;
@@ -119,7 +119,7 @@ class MEDIA_MOJO_EXPORT MojoRendererService
void OnFlushCompleted(const FlushCallback& callback);
// Callback executed once SetCdm() completes.
- void OnCdmAttached(scoped_refptr<MediaKeys> cdm,
+ void OnCdmAttached(scoped_refptr<ContentDecryptionModule> cdm,
const base::Callback<void(bool)>& callback,
bool success);
@@ -137,7 +137,7 @@ class MEDIA_MOJO_EXPORT MojoRendererService
// Hold a reference to the CDM set on the |renderer_| so that the CDM won't be
// destructed while the |renderer_| is still using it.
- scoped_refptr<MediaKeys> cdm_;
+ scoped_refptr<ContentDecryptionModule> cdm_;
// Audio and Video sinks.
// May be null if underlying |renderer_| does not use them.
« no previous file with comments | « media/mojo/services/mojo_decryptor_service.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698