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

Unified Diff: content/public/renderer/key_system_info.h

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 2 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
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | content/public/renderer/key_system_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/renderer/key_system_info.h
diff --git a/content/public/renderer/key_system_info.h b/content/public/renderer/key_system_info.h
deleted file mode 100644
index 9ec317d4bdc998863bbb07a0dc225b5f2e1fbfee..0000000000000000000000000000000000000000
--- a/content/public/renderer/key_system_info.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_
-#define CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_
-
-#include <map>
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/containers/hash_tables.h"
-#include "content/common/content_export.h"
-#include "content/public/common/eme_constants.h"
-
-// 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 {
-
-// Contains information about an EME key system as well as how to instantiate
-// the corresponding CDM.
-struct CONTENT_EXPORT KeySystemInfo {
- explicit KeySystemInfo(const std::string& key_system);
- ~KeySystemInfo();
-
- std::string key_system;
-
- // Specifies registered initialization data types supported by |key_system|.
- SupportedInitDataTypes supported_init_data_types;
-
- // Specifies codecs supported by |key_system|.
- SupportedCodecs supported_codecs;
-
- // 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.
- std::string parent_key_system;
-
- // The following indicate how the corresponding CDM should be instantiated.
- bool use_aes_decryptor;
-#if defined(ENABLE_PEPPER_CDMS)
- std::string pepper_type;
-#endif
-};
-
-} // namespace content
-
-#endif // CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | content/public/renderer/key_system_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698