| 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 <stdint.h> | 7 #include <stdint.h> |
| 8 #include <string.h> | 8 #include <string.h> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "base/values.h" | 24 #include "base/values.h" |
| 25 #include "build/build_config.h" | 25 #include "build/build_config.h" |
| 26 #include "chrome/common/chrome_paths.h" | 26 #include "chrome/common/chrome_paths.h" |
| 27 #include "chrome/common/widevine_cdm_constants.h" | 27 #include "chrome/common/widevine_cdm_constants.h" |
| 28 #include "components/component_updater/component_updater_service.h" | 28 #include "components/component_updater/component_updater_service.h" |
| 29 #include "components/component_updater/default_component_installer.h" | 29 #include "components/component_updater/default_component_installer.h" |
| 30 #include "components/version_info/version_info.h" | 30 #include "components/version_info/version_info.h" |
| 31 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
| 32 #include "content/public/browser/plugin_service.h" | 32 #include "content/public/browser/plugin_service.h" |
| 33 #include "content/public/common/pepper_plugin_info.h" | 33 #include "content/public/common/pepper_plugin_info.h" |
| 34 #include "media/cdm/ppapi/supported_cdm_versions.h" | 34 #include "media/cdm/supported_cdm_versions.h" |
| 35 #include "third_party/widevine/cdm/widevine_cdm_common.h" | 35 #include "third_party/widevine/cdm/widevine_cdm_common.h" |
| 36 | 36 |
| 37 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. NOLINT | 37 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. NOLINT |
| 38 | 38 |
| 39 using content::BrowserThread; | 39 using content::BrowserThread; |
| 40 using content::PluginService; | 40 using content::PluginService; |
| 41 | 41 |
| 42 namespace component_updater { | 42 namespace component_updater { |
| 43 | 43 |
| 44 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) | 44 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 scoped_ptr<ComponentInstallerTraits> traits( | 371 scoped_ptr<ComponentInstallerTraits> traits( |
| 372 new WidevineCdmComponentInstallerTraits); | 372 new WidevineCdmComponentInstallerTraits); |
| 373 // |cus| will take ownership of |installer| during installer->Register(cus). | 373 // |cus| will take ownership of |installer| during installer->Register(cus). |
| 374 DefaultComponentInstaller* installer = | 374 DefaultComponentInstaller* installer = |
| 375 new DefaultComponentInstaller(traits.Pass()); | 375 new DefaultComponentInstaller(traits.Pass()); |
| 376 installer->Register(cus, base::Closure()); | 376 installer->Register(cus, base::Closure()); |
| 377 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) | 377 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) |
| 378 } | 378 } |
| 379 | 379 |
| 380 } // namespace component_updater | 380 } // namespace component_updater |
| OLD | NEW |