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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 | 255 |
256 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ | 256 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ |
257 !defined(WIDEVINE_CDM_IS_COMPONENT) | 257 !defined(WIDEVINE_CDM_IS_COMPONENT) |
258 static bool skip_widevine_cdm_file_check = false; | 258 static bool skip_widevine_cdm_file_check = false; |
259 if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) { | 259 if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) { |
260 if (skip_widevine_cdm_file_check || base::PathExists(path)) { | 260 if (skip_widevine_cdm_file_check || base::PathExists(path)) { |
261 content::PepperPluginInfo widevine_cdm; | 261 content::PepperPluginInfo widevine_cdm; |
262 widevine_cdm.is_out_of_process = true; | 262 widevine_cdm.is_out_of_process = true; |
263 widevine_cdm.path = path; | 263 widevine_cdm.path = path; |
264 widevine_cdm.name = kWidevineCdmDisplayName; | 264 widevine_cdm.name = kWidevineCdmDisplayName; |
265 widevine_cdm.description = kWidevineCdmDescription; | 265 widevine_cdm.description = kWidevineCdmDescription + |
| 266 std::string(" (version: ") + |
| 267 WIDEVINE_CDM_VERSION_STRING + ")"; |
266 widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING; | 268 widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING; |
267 content::WebPluginMimeType widevine_cdm_mime_type( | 269 content::WebPluginMimeType widevine_cdm_mime_type( |
268 kWidevineCdmPluginMimeType, | 270 kWidevineCdmPluginMimeType, |
269 kWidevineCdmPluginExtension, | 271 kWidevineCdmPluginExtension, |
270 kWidevineCdmPluginMimeTypeDescription); | 272 kWidevineCdmPluginMimeTypeDescription); |
271 | 273 |
272 // Add the supported codecs as if they came from the component manifest. | 274 // Add the supported codecs as if they came from the component manifest. |
273 std::vector<std::string> codecs; | 275 std::vector<std::string> codecs; |
274 codecs.push_back(kCdmSupportedCodecVorbis); | 276 codecs.push_back(kCdmSupportedCodecVorbis); |
275 codecs.push_back(kCdmSupportedCodecVp8); | 277 codecs.push_back(kCdmSupportedCodecVp8); |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
534 int sandbox_type, | 536 int sandbox_type, |
535 int* sandbox_profile_resource_id) const { | 537 int* sandbox_profile_resource_id) const { |
536 DCHECK(sandbox_profile_resource_id); | 538 DCHECK(sandbox_profile_resource_id); |
537 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) { | 539 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) { |
538 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; | 540 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; |
539 return true; | 541 return true; |
540 } | 542 } |
541 return false; | 543 return false; |
542 } | 544 } |
543 #endif | 545 #endif |
OLD | NEW |