Chromium Code Reviews| Index: media/base/key_system_info.h |
| diff --git a/media/base/key_system_info.h b/media/base/key_system_info.h |
| index e259c00d855c755b397784e6662e8e88800dc7e6..4bdf0a5bedd2ecc995d639639b57dcd80d9a8d27 100644 |
| --- a/media/base/key_system_info.h |
| +++ b/media/base/key_system_info.h |
| @@ -30,8 +30,7 @@ namespace media { |
| // Contains information about an EME key system as well as how to instantiate |
| // the corresponding CDM. |
| struct MEDIA_EXPORT KeySystemInfo { |
| - explicit KeySystemInfo(const std::string& key_system); |
| - ~KeySystemInfo(); |
| + KeySystemInfo(); |
|
ddorwin
2015/02/19 01:41:33
We need to declare the destructor so that it is no
sandersd (OOO until July 31)
2015/02/19 21:08:34
Done.
|
| std::string key_system; |
| @@ -41,6 +40,12 @@ struct MEDIA_EXPORT KeySystemInfo { |
| // Specifies codecs supported by |key_system|. |
| SupportedCodecs supported_codecs; |
| + // Specifies session types and features supported by |key_system|. |
| + EmeSessionTypeSupport persistent_license_support; |
| + EmeSessionTypeSupport persistent_release_message_support; |
| + EmeFeatureSupport persistent_state_support; |
| + EmeFeatureSupport distinctive_identifier_support; |
| + |
| // A hierarchical parent for |key_system|. This value can be used to check |
| // supported types but cannot be used to instantiate a MediaKeys object. |
| // Only one parent key system is currently supported per concrete key system. |