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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cdm/aes_decryptor.cc

Issue 835683002: media: Always define |cdm_id| in CdmContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 9 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
« media/base/cdm_context.h ('K') | « media/cdm/aes_decryptor.h ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor.cc
diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc
index 2468c748b5f7b725e20691218218d7212475be95..eba09c44fe5e3e46eef0348b86fdd8e62dbbbf24 100644
--- a/media/cdm/aes_decryptor.cc
+++ b/media/cdm/aes_decryptor.cc
@@ -425,11 +425,9 @@ Decryptor* AesDecryptor::GetDecryptor() {
return this;
}
-#if defined(ENABLE_BROWSER_CDMS)
int AesDecryptor::GetCdmId() const {
return kInvalidCdmId;
}
-#endif // defined(ENABLE_BROWSER_CDMS)
void AesDecryptor::RegisterNewKeyCB(StreamType stream_type,
const NewKeyCB& new_key_cb) {
« media/base/cdm_context.h ('K') | « media/cdm/aes_decryptor.h ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698