| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/renderer/media/cdm/proxy_media_keys.h" | 5 #include "content/renderer/media/cdm/proxy_media_keys.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | |
| 10 #include "base/logging.h" | 9 #include "base/logging.h" |
| 11 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 12 #include "content/renderer/media/cdm/renderer_cdm_manager.h" | 11 #include "content/renderer/media/cdm/renderer_cdm_manager.h" |
| 13 #include "media/base/cdm_initialized_promise.h" | 12 #include "media/base/cdm_initialized_promise.h" |
| 14 #include "media/base/cdm_key_information.h" | 13 #include "media/base/cdm_key_information.h" |
| 15 #include "media/base/cdm_promise.h" | 14 #include "media/base/cdm_promise.h" |
| 16 #include "media/base/key_systems.h" | 15 #include "media/base/key_systems.h" |
| 17 | 16 |
| 18 namespace content { | 17 namespace content { |
| 19 | 18 |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 const std::string& key_system, | 194 const std::string& key_system, |
| 196 const GURL& security_origin, | 195 const GURL& security_origin, |
| 197 bool use_hw_secure_codecs, | 196 bool use_hw_secure_codecs, |
| 198 scoped_ptr<media::SimpleCdmPromise> promise) { | 197 scoped_ptr<media::SimpleCdmPromise> promise) { |
| 199 uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass()); | 198 uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass()); |
| 200 manager_->InitializeCdm(cdm_id_, promise_id, this, key_system, | 199 manager_->InitializeCdm(cdm_id_, promise_id, this, key_system, |
| 201 security_origin, use_hw_secure_codecs); | 200 security_origin, use_hw_secure_codecs); |
| 202 } | 201 } |
| 203 | 202 |
| 204 } // namespace content | 203 } // namespace content |
| OLD | NEW |