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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 2582463003: media: Verify CDM Host files (Closed)
Patch Set: VerifyFiles() now returns a boolean. 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. 78 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR.
79 #include "ppapi/shared_impl/ppapi_permissions.h" 79 #include "ppapi/shared_impl/ppapi_permissions.h"
80 #endif 80 #endif
81 81
82 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \ 82 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \
83 !defined(WIDEVINE_CDM_IS_COMPONENT) 83 !defined(WIDEVINE_CDM_IS_COMPONENT)
84 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT 84 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT
85 #include "chrome/common/widevine_cdm_constants.h" 85 #include "chrome/common/widevine_cdm_constants.h"
86 #endif 86 #endif
87 87
88 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
89 #include "chrome/common/media/cdm_host_file_path.h"
90 #endif
91
88 #if defined(OS_ANDROID) 92 #if defined(OS_ANDROID)
89 #include "chrome/common/chrome_media_client_android.h" 93 #include "chrome/common/chrome_media_client_android.h"
90 #endif 94 #endif
91 95
92 namespace { 96 namespace {
93 97
94 #if BUILDFLAG(ENABLE_PLUGINS) 98 #if BUILDFLAG(ENABLE_PLUGINS)
95 #if BUILDFLAG(ENABLE_PDF) 99 #if BUILDFLAG(ENABLE_PDF)
96 const char kPDFPluginExtension[] = "pdf"; 100 const char kPDFPluginExtension[] = "pdf";
97 const char kPDFPluginDescription[] = "Portable Document Format"; 101 const char kPDFPluginDescription[] = "Portable Document Format";
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 const base::Version version(WIDEVINE_CDM_VERSION_STRING); 553 const base::Version version(WIDEVINE_CDM_VERSION_STRING);
550 DCHECK(version.IsValid()); 554 DCHECK(version.IsValid());
551 cdms->push_back(content::CdmInfo(kWidevineCdmType, version, cdm_path, 555 cdms->push_back(content::CdmInfo(kWidevineCdmType, version, cdm_path,
552 codecs_supported)); 556 codecs_supported));
553 } 557 }
554 #endif // defined(WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT) 558 #endif // defined(WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT)
555 559
556 // TODO(jrummell): Add External Clear Key CDM for testing, if it's available. 560 // TODO(jrummell): Add External Clear Key CDM for testing, if it's available.
557 } 561 }
558 562
563 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
564 void ChromeContentClient::AddContentDecryptionModuleHostFilePaths(
565 std::vector<content::CdmHostFilePath>* cdm_host_file_paths) {
566 chrome::AddCdmHostFilePaths(cdm_host_file_paths);
567 }
568 #endif
569
559 static const char* const kChromeStandardURLSchemes[] = { 570 static const char* const kChromeStandardURLSchemes[] = {
560 extensions::kExtensionScheme, 571 extensions::kExtensionScheme,
561 chrome::kChromeNativeScheme, 572 chrome::kChromeNativeScheme,
562 chrome::kChromeSearchScheme, 573 chrome::kChromeSearchScheme,
563 dom_distiller::kDomDistillerScheme, 574 dom_distiller::kDomDistillerScheme,
564 #if defined(OS_CHROMEOS) 575 #if defined(OS_CHROMEOS)
565 chrome::kCrosScheme, 576 chrome::kCrosScheme,
566 #endif 577 #endif
567 }; 578 };
568 579
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 if (!origin_trial_policy_) 699 if (!origin_trial_policy_)
689 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); 700 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>();
690 return origin_trial_policy_.get(); 701 return origin_trial_policy_.get();
691 } 702 }
692 703
693 #if defined(OS_ANDROID) 704 #if defined(OS_ANDROID)
694 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { 705 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
695 return new ChromeMediaClientAndroid(); 706 return new ChromeMediaClientAndroid();
696 } 707 }
697 #endif // OS_ANDROID 708 #endif // OS_ANDROID
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698