| OLD | NEW |
| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 !defined(WIDEVINE_CDM_IS_COMPONENT) | 84 !defined(WIDEVINE_CDM_IS_COMPONENT) |
| 85 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT | 85 #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT |
| 86 #include "chrome/common/widevine_cdm_constants.h" | 86 #include "chrome/common/widevine_cdm_constants.h" |
| 87 #endif | 87 #endif |
| 88 | 88 |
| 89 #if BUILDFLAG(ENABLE_PEPPER_CDMS) | 89 #if BUILDFLAG(ENABLE_PEPPER_CDMS) |
| 90 #include "chrome/common/media/cdm_host_file_path.h" | 90 #include "chrome/common/media/cdm_host_file_path.h" |
| 91 #endif | 91 #endif |
| 92 | 92 |
| 93 #if defined(OS_ANDROID) | 93 #if defined(OS_ANDROID) |
| 94 #include "chrome/common/chrome_media_client_android.h" | 94 #include "chrome/common/media/chrome_media_drm_bridge_client.h" |
| 95 #endif | 95 #endif |
| 96 | 96 |
| 97 namespace { | 97 namespace { |
| 98 | 98 |
| 99 #if BUILDFLAG(ENABLE_PLUGINS) | 99 #if BUILDFLAG(ENABLE_PLUGINS) |
| 100 #if BUILDFLAG(ENABLE_PDF) | 100 #if BUILDFLAG(ENABLE_PDF) |
| 101 const char kPDFPluginExtension[] = "pdf"; | 101 const char kPDFPluginExtension[] = "pdf"; |
| 102 const char kPDFPluginDescription[] = "Portable Document Format"; | 102 const char kPDFPluginDescription[] = "Portable Document Format"; |
| 103 const char kPDFPluginOutOfProcessMimeType[] = | 103 const char kPDFPluginOutOfProcessMimeType[] = |
| 104 "application/x-google-chrome-pdf"; | 104 "application/x-google-chrome-pdf"; |
| (...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 #endif | 705 #endif |
| 706 } | 706 } |
| 707 | 707 |
| 708 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() { | 708 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() { |
| 709 if (!origin_trial_policy_) | 709 if (!origin_trial_policy_) |
| 710 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); | 710 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); |
| 711 return origin_trial_policy_.get(); | 711 return origin_trial_policy_.get(); |
| 712 } | 712 } |
| 713 | 713 |
| 714 #if defined(OS_ANDROID) | 714 #if defined(OS_ANDROID) |
| 715 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { | 715 media::MediaDrmBridgeClient* ChromeContentClient::GetMediaDrmBridgeClient() { |
| 716 return new ChromeMediaClientAndroid(); | 716 return new ChromeMediaDrmBridgeClient(); |
| 717 } | 717 } |
| 718 #endif // OS_ANDROID | 718 #endif // OS_ANDROID |
| OLD | NEW |