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

Unified Diff: chrome/common/chrome_content_client.cc

Issue 2582463003: media: Verify CDM Host files (Closed)
Patch Set: Polished! Created 3 years, 11 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
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 4cf646b0e4ac2376c58466ba811aadd621171a02..f0d21087530d2c53e32470bd2c9fad6349bb09d5 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -29,6 +29,7 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/crash_keys.h"
+#include "chrome/common/media/cdm_host_file_path.h"
jrummell 2017/01/18 21:46:45 This is only needed if BUILDFLAG(ENABLE_PEPPER_CDM
xhwang 2017/01/18 22:29:08 Done.
#include "chrome/common/pepper_flash.h"
#include "chrome/common/secure_origin_whitelist.h"
#include "chrome/common/url_constants.h"
@@ -555,6 +556,13 @@ void ChromeContentClient::AddContentDecryptionModules(
// TODO(jrummell): Add External Clear Key CDM for testing, if it's available.
}
+#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+void ChromeContentClient::AddContentDecryptionModuleHostFilePaths(
+ std::vector<content::CdmHostFilePath>* cdm_host_file_paths) {
+ AddCdmHostFilePaths(cdm_host_file_paths);
Greg K 2017/01/19 04:13:07 Not sure, but should this be namespaced? Otherwise
xhwang 2017/01/19 08:30:50 Well, a lot of chrome/ classes (e.g. ChromeContent
Greg K 2017/01/25 06:15:31 Yeah I guess the owners can decide this one, was j
+}
+#endif
+
static const char* const kChromeStandardURLSchemes[] = {
extensions::kExtensionScheme,
chrome::kChromeNativeScheme,

Powered by Google App Engine
This is Rietveld 408576698