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

Unified Diff: content/browser/media/cdm/browser_cdm_manager.h

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Split original CL into two, this is first part Created 5 years, 3 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
Index: content/browser/media/cdm/browser_cdm_manager.h
diff --git a/content/browser/media/cdm/browser_cdm_manager.h b/content/browser/media/cdm/browser_cdm_manager.h
index 629a49d84eff165ab6565d9de5f7334524144747..02641000244535638f52a3e04cdf31f2699d0fd2 100644
--- a/content/browser/media/cdm/browser_cdm_manager.h
+++ b/content/browser/media/cdm/browser_cdm_manager.h
@@ -20,6 +20,7 @@
#include "content/public/browser/browser_message_filter.h"
#include "content/public/common/permission_status.mojom.h"
#include "ipc/ipc_message.h"
+#include "media/base/browser_cdm.h"
#include "media/base/cdm_promise.h"
#include "media/base/eme_constants.h"
#include "media/base/media_keys.h"
@@ -27,10 +28,6 @@
struct CdmHostMsg_CreateSessionAndGenerateRequest_Params;
-namespace media {
-class BrowserCdm;
-}
-
namespace content {
// This class manages all CDM objects. It receives control operations from the
@@ -200,7 +197,7 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {
// |cdm_id|.
// Map of managed BrowserCdms.
- typedef base::ScopedPtrHashMap<uint64, scoped_ptr<media::BrowserCdm>> CdmMap;
+ typedef base::ScopedPtrHashMap<uint64, media::BrowserCdmPtr> CdmMap;
CdmMap cdm_map_;
// Map of CDM's security origin.

Powered by Google App Engine
This is Rietveld 408576698