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

Unified Diff: media/blink/webmediaplayer_params.h

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix isRenewalMessage() in browser tests. Created 4 years, 10 months 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/webmediaplayer_impl.cc ('k') | media/blink/webmediaplayer_params.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_params.h
diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h
index 0c728da483ccd939c5ae606659b583b4564c3cdd..deb868fd418492fa7c8b9b4f735d7417fda76623 100644
--- a/media/blink/webmediaplayer_params.h
+++ b/media/blink/webmediaplayer_params.h
@@ -28,7 +28,6 @@ namespace media {
class RestartableAudioRendererSink;
class MediaLog;
-class MediaPermission;
class SurfaceManager;
// Holds parameters for constructing WebMediaPlayerImpl without having
@@ -56,7 +55,6 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
const Context3DCB& context_3d,
const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb,
- MediaPermission* media_permission,
blink::WebContentDecryptionModule* initial_cdm,
SurfaceManager* surface_manager,
blink::WebMediaSession* media_session);
@@ -89,8 +87,6 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
Context3DCB context_3d_cb() const { return context_3d_cb_; }
- MediaPermission* media_permission() const { return media_permission_; }
-
blink::WebContentDecryptionModule* initial_cdm() const {
return initial_cdm_;
}
@@ -113,8 +109,6 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
Context3DCB context_3d_cb_;
AdjustAllocatedMemoryCB adjust_allocated_memory_cb_;
- // TODO(xhwang): Remove after prefixed EME API support is removed.
- MediaPermission* media_permission_;
blink::WebContentDecryptionModule* initial_cdm_;
SurfaceManager* surface_manager_;
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediaplayer_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698