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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cdm/aes_decryptor.h

Issue 835683002: media: Always define |cdm_id| in CdmContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 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
« content/renderer/media/crypto/ppapi_decryptor.cc ('K') | « media/base/cdm_context.h ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor.h
diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h
index 8f974877ef96169fd07f028739fb6d7af5672b8a..5180f574d0bbc0dabbe128fba2d96aced6db79b9 100644
--- a/media/cdm/aes_decryptor.h
+++ b/media/cdm/aes_decryptor.h
@@ -58,9 +58,7 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys,
// CdmContext implementation.
Decryptor* GetDecryptor() override;
-#if defined(ENABLE_BROWSER_CDMS)
- virtual int GetCdmId() const override;
-#endif // defined(ENABLE_BROWSER_CDMS)
+ int GetCdmId() const override;
// Decryptor implementation.
void RegisterNewKeyCB(StreamType stream_type,
« content/renderer/media/crypto/ppapi_decryptor.cc ('K') | « media/base/cdm_context.h ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698