| Index: media/base/cdm_promise.cc
|
| diff --git a/media/base/cdm_promise.cc b/media/base/cdm_promise.cc
|
| index 9062799368927f8b081ada776bb5b1d7fe1fcaa5..d1cb7ade05231783ebe695aec64bb6531f1e5bff 100644
|
| --- a/media/base/cdm_promise.cc
|
| +++ b/media/base/cdm_promise.cc
|
| @@ -6,10 +6,41 @@
|
|
|
| namespace media {
|
|
|
| -CdmPromise::CdmPromise() {
|
| +const CdmPromise::ResolveParameterType CdmPromiseTraits<>::kType =
|
| + CdmPromise::VOID_TYPE;
|
| +
|
| +const CdmPromise::ResolveParameterType CdmPromiseTraits<int>::kType =
|
| + CdmPromise::INT_TYPE;
|
| +
|
| +const CdmPromise::ResolveParameterType CdmPromiseTraits<std::string>::kType =
|
| + CdmPromise::STRING_TYPE;
|
| +
|
| +const CdmPromise::ResolveParameterType
|
| + CdmPromiseTraits<CdmKeyInformation::KeyStatus>::kType =
|
| + CdmPromise::KEY_STATUS_TYPE;
|
| +
|
| +template <>
|
| +CdmPromise::ResolveParameterType CdmPromiseTemplate<>::GetResolveParameterType()
|
| + const {
|
| + return CdmPromiseTraits<>::kType;
|
| +}
|
| +
|
| +template <>
|
| +CdmPromise::ResolveParameterType
|
| +CdmPromiseTemplate<int>::GetResolveParameterType() const {
|
| + return CdmPromiseTraits<int>::kType;
|
| +}
|
| +
|
| +template <>
|
| +CdmPromise::ResolveParameterType
|
| +CdmPromiseTemplate<std::string>::GetResolveParameterType() const {
|
| + return CdmPromiseTraits<std::string>::kType;
|
| }
|
|
|
| -CdmPromise::~CdmPromise() {
|
| +template <>
|
| +CdmPromise::ResolveParameterType CdmPromiseTemplate<
|
| + CdmKeyInformation::KeyStatus>::GetResolveParameterType() const {
|
| + return CdmPromiseTraits<CdmKeyInformation::KeyStatus>::kType;
|
| }
|
|
|
| } // namespace media
|
|
|