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

Unified Diff: media/blink/cdm_result_promise.h

Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception (Closed)
Patch Set: include "media/base/media_keys.h" Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/media_keys.h ('k') | media/blink/cdm_result_promise_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/cdm_result_promise.h
diff --git a/media/blink/cdm_result_promise.h b/media/blink/cdm_result_promise.h
index 0f7eeb18531bd50ff63a8d1b7e22895641a026f8..e7fcb2f9d7f8248d7ff40c595bc2fca2e2a59198 100644
--- a/media/blink/cdm_result_promise.h
+++ b/media/blink/cdm_result_promise.h
@@ -8,8 +8,6 @@
#include <stdint.h>
#include "base/macros.h"
-#include "media/base/cdm_promise.h"
-#include "media/base/media_keys.h"
#include "media/blink/cdm_result_promise_helper.h"
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -32,7 +30,7 @@ class CdmResultPromise : public CdmPromiseTemplate<T...> {
// CdmPromiseTemplate<T> implementation.
void resolve(const T&... result) override;
- void reject(MediaKeys::Exception exception_code,
+ void reject(CdmPromise::Exception exception_code,
uint32_t system_code,
const std::string& error_message) override;
@@ -72,7 +70,7 @@ inline void CdmResultPromise<>::resolve() {
}
template <typename... T>
-void CdmResultPromise<T...>::reject(MediaKeys::Exception exception_code,
+void CdmResultPromise<T...>::reject(CdmPromise::Exception exception_code,
uint32_t system_code,
const std::string& error_message) {
MarkPromiseSettled();
« no previous file with comments | « media/base/media_keys.h ('k') | media/blink/cdm_result_promise_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698