OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/browser/component_updater/widevine_cdm_component_installer.h" | 5 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 version.components().size() != | 119 version.components().size() != |
120 static_cast<size_t>(kWidevineCdmVersionNumComponents)) { | 120 static_cast<size_t>(kWidevineCdmVersionNumComponents)) { |
121 return false; | 121 return false; |
122 } | 122 } |
123 | 123 |
124 plugin_info->is_internal = false; | 124 plugin_info->is_internal = false; |
125 // Widevine CDM must run out of process. | 125 // Widevine CDM must run out of process. |
126 plugin_info->is_out_of_process = true; | 126 plugin_info->is_out_of_process = true; |
127 plugin_info->path = path; | 127 plugin_info->path = path; |
128 plugin_info->name = kWidevineCdmDisplayName; | 128 plugin_info->name = kWidevineCdmDisplayName; |
129 plugin_info->description = kWidevineCdmDescription; | 129 plugin_info->description = kWidevineCdmDescription + |
| 130 std::string(" (version: ") + version.GetString() + |
| 131 ")"; |
130 plugin_info->version = version.GetString(); | 132 plugin_info->version = version.GetString(); |
131 content::WebPluginMimeType widevine_cdm_mime_type( | 133 content::WebPluginMimeType widevine_cdm_mime_type( |
132 kWidevineCdmPluginMimeType, | 134 kWidevineCdmPluginMimeType, |
133 kWidevineCdmPluginExtension, | 135 kWidevineCdmPluginExtension, |
134 kWidevineCdmPluginMimeTypeDescription); | 136 kWidevineCdmPluginMimeTypeDescription); |
135 widevine_cdm_mime_type.additional_param_names = additional_param_names; | 137 widevine_cdm_mime_type.additional_param_names = additional_param_names; |
136 widevine_cdm_mime_type.additional_param_values = additional_param_values; | 138 widevine_cdm_mime_type.additional_param_values = additional_param_values; |
137 plugin_info->mime_types.push_back(widevine_cdm_mime_type); | 139 plugin_info->mime_types.push_back(widevine_cdm_mime_type); |
138 plugin_info->permissions = kWidevineCdmPluginPermissions; | 140 plugin_info->permissions = kWidevineCdmPluginPermissions; |
139 | 141 |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
368 // |cus| will take ownership of |installer| during installer->Register(cus). | 370 // |cus| will take ownership of |installer| during installer->Register(cus). |
369 DefaultComponentInstaller* installer = | 371 DefaultComponentInstaller* installer = |
370 new DefaultComponentInstaller(traits.Pass()); | 372 new DefaultComponentInstaller(traits.Pass()); |
371 installer->Register(cus); | 373 installer->Register(cus); |
372 #else | 374 #else |
373 return; | 375 return; |
374 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) | 376 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) |
375 } | 377 } |
376 | 378 |
377 } // namespace component_updater | 379 } // namespace component_updater |
OLD | NEW |