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 25 matching lines...) Expand all Loading... |
36 #include "components/dom_distiller/core/url_constants.h" | 36 #include "components/dom_distiller/core/url_constants.h" |
37 #include "components/version_info/version_info.h" | 37 #include "components/version_info/version_info.h" |
38 #include "content/public/common/cdm_info.h" | 38 #include "content/public/common/cdm_info.h" |
39 #include "content/public/common/content_constants.h" | 39 #include "content/public/common/content_constants.h" |
40 #include "content/public/common/content_switches.h" | 40 #include "content/public/common/content_switches.h" |
41 #include "content/public/common/url_constants.h" | 41 #include "content/public/common/url_constants.h" |
42 #include "content/public/common/user_agent.h" | 42 #include "content/public/common/user_agent.h" |
43 #include "extensions/common/constants.h" | 43 #include "extensions/common/constants.h" |
44 #include "extensions/features/features.h" | 44 #include "extensions/features/features.h" |
45 #include "gpu/config/gpu_info.h" | 45 #include "gpu/config/gpu_info.h" |
| 46 #include "media/media_features.h" |
46 #include "net/http/http_util.h" | 47 #include "net/http/http_util.h" |
47 #include "pdf/features.h" | 48 #include "pdf/features.h" |
48 #include "ppapi/features/features.h" | 49 #include "ppapi/features/features.h" |
49 #include "ui/base/l10n/l10n_util.h" | 50 #include "ui/base/l10n/l10n_util.h" |
50 #include "ui/base/layout.h" | 51 #include "ui/base/layout.h" |
51 #include "ui/base/resource/resource_bundle.h" | 52 #include "ui/base/resource/resource_bundle.h" |
52 #include "url/url_constants.h" | 53 #include "url/url_constants.h" |
53 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 54 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
54 | 55 |
55 #if defined(OS_LINUX) | 56 #if defined(OS_LINUX) |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 widevine_cdm_file_check = | 130 widevine_cdm_file_check = |
130 (base::PathExists(*adapter_path) && base::PathExists(*cdm_path)) | 131 (base::PathExists(*adapter_path) && base::PathExists(*cdm_path)) |
131 ? FOUND | 132 ? FOUND |
132 : NOT_FOUND; | 133 : NOT_FOUND; |
133 } | 134 } |
134 if (widevine_cdm_file_check == FOUND) { | 135 if (widevine_cdm_file_check == FOUND) { |
135 // Add the supported codecs as if they came from the component manifest. | 136 // Add the supported codecs as if they came from the component manifest. |
136 // This list must match the CDM that is being bundled with Chrome. | 137 // This list must match the CDM that is being bundled with Chrome. |
137 codecs_supported->push_back(kCdmSupportedCodecVp8); | 138 codecs_supported->push_back(kCdmSupportedCodecVp8); |
138 codecs_supported->push_back(kCdmSupportedCodecVp9); | 139 codecs_supported->push_back(kCdmSupportedCodecVp9); |
139 #if defined(USE_PROPRIETARY_CODECS) | 140 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
140 codecs_supported->push_back(kCdmSupportedCodecAvc1); | 141 codecs_supported->push_back(kCdmSupportedCodecAvc1); |
141 #endif // defined(USE_PROPRIETARY_CODECS) | 142 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) |
142 return true; | 143 return true; |
143 } | 144 } |
144 } | 145 } |
145 | 146 |
146 return false; | 147 return false; |
147 } | 148 } |
148 #endif // defined(WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT) | 149 #endif // defined(WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT) |
149 | 150 |
150 // Appends the known built-in plugins to the given vector. Some built-in | 151 // Appends the known built-in plugins to the given vector. Some built-in |
151 // plugins are "internal" which means they are compiled into the Chrome binary, | 152 // plugins are "internal" which means they are compiled into the Chrome binary, |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
688 if (!origin_trial_policy_) | 689 if (!origin_trial_policy_) |
689 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); | 690 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); |
690 return origin_trial_policy_.get(); | 691 return origin_trial_policy_.get(); |
691 } | 692 } |
692 | 693 |
693 #if defined(OS_ANDROID) | 694 #if defined(OS_ANDROID) |
694 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { | 695 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { |
695 return new ChromeMediaClientAndroid(); | 696 return new ChromeMediaClientAndroid(); |
696 } | 697 } |
697 #endif // OS_ANDROID | 698 #endif // OS_ANDROID |
OLD | NEW |