summaryrefslogtreecommitdiffstats
path: root/content/renderer/media/crypto/key_systems.h
diff options
context:
space:
mode:
authorddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-07 23:28:17 +0000
committerddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-07 23:28:17 +0000
commit28f45d5c8622a27ee96861fa7adca51b48f09e38 (patch)
tree31668acb87ace5081048f2eaa6e50279ed8bbd48 /content/renderer/media/crypto/key_systems.h
parent1be63b4449c5e1bcaa93260392a7ab7248610d7c (diff)
downloadchromium_src-28f45d5c8622a27ee96861fa7adca51b48f09e38.zip
chromium_src-28f45d5c8622a27ee96861fa7adca51b48f09e38.tar.gz
chromium_src-28f45d5c8622a27ee96861fa7adca51b48f09e38.tar.bz2
Refactor KeySystems code to call a function to populate the info.
This allows KeySystems to call GetContentClient()->AddKeySystems() so we can move key system information to chrome/. The new ContentClient API is defined and called, but we still rely on key_systems_info.cc. BUG=224793 TEST=Existing content_unittests and content_browsertests pass. Review URL: https://chromiumcodereview.appspot.com/23678008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/crypto/key_systems.h')
-rw-r--r--content/renderer/media/crypto/key_systems.h41
1 files changed, 0 insertions, 41 deletions
diff --git a/content/renderer/media/crypto/key_systems.h b/content/renderer/media/crypto/key_systems.h
index 4657842..47dc06a 100644
--- a/content/renderer/media/crypto/key_systems.h
+++ b/content/renderer/media/crypto/key_systems.h
@@ -15,49 +15,8 @@ namespace WebKit {
class WebString;
}
-// Definitions:
-// * Key system
-// https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#key-system
-// * Concrete key system
-// A key system string that can be instantiated, such as
-// via the MediaKeys constructor. Examples include "org.w3.clearkey" and
-// "com.widevine.alpha".
-// * Abstract key system
-// A key system string that cannot be instantiated like a concrete key system
-// but is otherwise useful, such as in discovery using isTypeSupported().
-// * Parent key system
-// A key system string that is one level up from the child key system. It may
-// be an abstract key system.
-// As an example, "com.example" is the parent of "com.example.foo".
-
namespace content {
-// Adds a concrete key system along with platform-specific information about how
-// to instantiate it. Must be called before AddSupportedType().
-// May only be called once per |concrete_key_system|.
-// When not empty, |parent_key_system| will add a mapping to the
-// |concrete_key_system| that can be used to check supported types.
-// Only one parent key system is currently supported per concrete key system.
-CONTENT_EXPORT void AddConcreteSupportedKeySystem(
- const std::string& concrete_key_system,
- bool use_aes_decryptor,
-#if defined(ENABLE_PEPPER_CDMS)
- const std::string& pepper_type,
-#elif defined(OS_ANDROID)
- const uint8 uuid[16],
-#endif
- const std::string& parent_key_system);
-
-// Specifies the container and codec combinations supported by
-// |concrete_key_system|.
-// Multiple codecs can be listed. In all cases, the container
-// without a codec is also supported.
-// |concrete_key_system| must be a concrete supported key system previously
-// added using AddConcreteSupportedKeySystem().
-CONTENT_EXPORT void AddSupportedType(const std::string& concrete_key_system,
- const std::string& mime_type,
- const std::string& codecs_list);
-
// Returns whether |key_system| is a real supported key system that can be
// instantiated.
// Abstract parent |key_system| strings will return false.