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

Unified Diff: media/blink/webencryptedmediaclient_impl.h

Issue 2712983004: Simplify/Cleanup MediaClient (Closed)
Patch Set: Fix test leak Created 3 years, 8 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/base/media_log.h ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webencryptedmediaclient_impl.h
diff --git a/media/blink/webencryptedmediaclient_impl.h b/media/blink/webencryptedmediaclient_impl.h
index 3bb91050349c4a3c29ff59b4e571123634a127bb..a0efd2a3032c9db943e727559c9ee8f1ab75c34e 100644
--- a/media/blink/webencryptedmediaclient_impl.h
+++ b/media/blink/webencryptedmediaclient_impl.h
@@ -10,6 +10,7 @@
#include <unordered_map>
#include "base/callback.h"
+#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "media/blink/key_system_config_selector.h"
#include "media/blink/media_blink_export.h"
@@ -27,6 +28,7 @@ namespace media {
struct CdmConfig;
class CdmFactory;
+class MediaLog;
class MediaPermission;
class MEDIA_BLINK_EXPORT WebEncryptedMediaClientImpl
@@ -35,7 +37,8 @@ class MEDIA_BLINK_EXPORT WebEncryptedMediaClientImpl
WebEncryptedMediaClientImpl(
base::Callback<bool(void)> are_secure_codecs_supported_cb,
CdmFactory* cdm_factory,
- MediaPermission* media_permission);
+ MediaPermission* media_permission,
+ const scoped_refptr<MediaLog>& media_log);
~WebEncryptedMediaClientImpl() override;
// WebEncryptedMediaClient implementation.
@@ -78,6 +81,7 @@ class MEDIA_BLINK_EXPORT WebEncryptedMediaClientImpl
base::Callback<bool(void)> are_secure_codecs_supported_cb_;
CdmFactory* cdm_factory_;
KeySystemConfigSelector key_system_config_selector_;
+ scoped_refptr<MediaLog> media_log_;
base::WeakPtrFactory<WebEncryptedMediaClientImpl> weak_factory_;
};
« no previous file with comments | « media/base/media_log.h ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698