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

Unified Diff: media/blink/webmediaplayer_impl.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/blink/webcontentdecryptionmodulesession_impl.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.h
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index 6e01840d71c6e0e05129c139d91354fd04f2f4d9..020adcea097348c4a25ddcf5e7fe15aac47540d1 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -70,7 +70,7 @@ class GLES2Interface;
namespace media {
class ChunkDemuxer;
-class MediaKeys;
+class ContentDecryptionModule;
class MediaLog;
class UrlIndex;
class VideoFrameCompositor;
@@ -496,11 +496,11 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
// If a CDM is attached keep a reference to it, so that it is not destroyed
// until after the pipeline is done with it.
- scoped_refptr<MediaKeys> cdm_;
+ scoped_refptr<ContentDecryptionModule> cdm_;
// Keep track of the CDM while it is in the process of attaching to the
// pipeline.
- scoped_refptr<MediaKeys> pending_cdm_;
+ scoped_refptr<ContentDecryptionModule> pending_cdm_;
#if defined(OS_ANDROID) // WMPI_CAST
WebMediaPlayerCast cast_impl_;
« no previous file with comments | « media/blink/webcontentdecryptionmodulesession_impl.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698