Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Side by Side Diff: media/mojo/services/mojo_cdm_promise.h

Issue 817143003: Fix MojoCdmPromise resolving. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | media/mojo/services/mojo_cdm_promise.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "media/base/cdm_promise.h" 9 #include "media/base/cdm_promise.h"
10 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 10 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
(...skipping 13 matching lines...) Expand all
24 MojoCdmPromise(const CallbackType& callback); 24 MojoCdmPromise(const CallbackType& callback);
25 ~MojoCdmPromise() final; 25 ~MojoCdmPromise() final;
26 26
27 // CdmPromiseTemplate<> implementation. 27 // CdmPromiseTemplate<> implementation.
28 void resolve(const T&... result) final; 28 void resolve(const T&... result) final;
29 void reject(MediaKeys::Exception exception, 29 void reject(MediaKeys::Exception exception,
30 uint32_t system_code, 30 uint32_t system_code,
31 const std::string& error_message) final; 31 const std::string& error_message) final;
32 32
33 private: 33 private:
34 using media::CdmPromiseTemplate<T...>::MarkPromiseSettled;
35
34 CallbackType callback_; 36 CallbackType callback_;
35 }; 37 };
36 38
37 } // namespace media 39 } // namespace media
38 40
39 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ 41 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_
OLDNEW
« no previous file with comments | « no previous file | media/mojo/services/mojo_cdm_promise.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698