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

Unified Diff: media/mojo/services/mojo_cdm_promise.cc

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/mojo/services/mojo_cdm_promise.h ('k') | media/mojo/services/mojo_cdm_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm_promise.cc
diff --git a/media/mojo/services/mojo_cdm_promise.cc b/media/mojo/services/mojo_cdm_promise.cc
index 2de75b91b01c4a34a66e44c43052e603e1eab6d0..da9ae8c194183ac73cdbd4b8be351074115b0095 100644
--- a/media/mojo/services/mojo_cdm_promise.cc
+++ b/media/mojo/services/mojo_cdm_promise.cc
@@ -11,12 +11,11 @@
#include "base/bind.h"
#include "base/logging.h"
#include "media/base/decryptor.h"
-#include "media/base/media_keys.h"
namespace media {
static mojom::CdmPromiseResultPtr GetRejectResult(
- MediaKeys::Exception exception,
+ CdmPromise::Exception exception,
uint32_t system_code,
const std::string& error_message) {
mojom::CdmPromiseResultPtr cdm_promise_result(mojom::CdmPromiseResult::New());
@@ -52,7 +51,7 @@ void MojoCdmPromise<T...>::resolve(const T&... result) {
}
template <typename... T>
-void MojoCdmPromise<T...>::reject(MediaKeys::Exception exception,
+void MojoCdmPromise<T...>::reject(CdmPromise::Exception exception,
uint32_t system_code,
const std::string& error_message) {
MarkPromiseSettled();
« no previous file with comments | « media/mojo/services/mojo_cdm_promise.h ('k') | media/mojo/services/mojo_cdm_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698