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

Unified Diff: media/base/cdm_factory.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/base/cdm_callback_promise.h ('k') | media/base/cdm_initialized_promise.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/cdm_factory.h
diff --git a/media/base/cdm_factory.h b/media/base/cdm_factory.h
index 02fe962e459513075b39acc3aa575da22090a41c..f7a72fa9d58fa6710d411f990475a0cf56862ccb 100644
--- a/media/base/cdm_factory.h
+++ b/media/base/cdm_factory.h
@@ -8,17 +8,18 @@
#include <string>
#include "base/macros.h"
+#include "media/base/content_decryption_module.h"
#include "media/base/media_export.h"
-#include "media/base/media_keys.h"
class GURL;
namespace media {
// Callback used when CDM is created. |error_message| only used if
-// MediaKeys is null (i.e. CDM can't be created).
-using CdmCreatedCB = base::Callback<void(const scoped_refptr<MediaKeys>&,
- const std::string& error_message)>;
+// ContentDecryptionModule is null (i.e. CDM can't be created).
+using CdmCreatedCB =
+ base::Callback<void(const scoped_refptr<ContentDecryptionModule>&,
+ const std::string& error_message)>;
struct CdmConfig;
« no previous file with comments | « media/base/cdm_callback_promise.h ('k') | media/base/cdm_initialized_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698