diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
| commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
| tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/media/base/key_systems.h | |
| parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
| download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz | |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/media/base/key_systems.h')
| -rw-r--r-- | chromium/media/base/key_systems.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/media/base/key_systems.h b/chromium/media/base/key_systems.h index 0471e63351d..b6d9cee2aa1 100644 --- a/chromium/media/base/key_systems.h +++ b/chromium/media/base/key_systems.h @@ -12,6 +12,7 @@ #include "media/base/eme_constants.h" #include "media/base/media_export.h" +#include "ppapi/features/features.h" namespace media { @@ -82,7 +83,7 @@ MEDIA_EXPORT std::string GetKeySystemNameForUMA(const std::string& key_system); // Returns whether AesDecryptor can be used for the given |key_system|. MEDIA_EXPORT bool CanUseAesDecryptor(const std::string& key_system); -#if defined(ENABLE_PEPPER_CDMS) +#if BUILDFLAG(ENABLE_PEPPER_CDMS) // Returns the Pepper MIME type for |key_system|. // Returns empty string if |key_system| is unknown or not Pepper-based. MEDIA_EXPORT std::string GetPepperType(const std::string& key_system); |