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

Unified Diff: media/mojo/clients/mojo_cdm.cc

Issue 2425663003: media: Use native CDM enum types in media mojo interfaces (Closed)
Patch Set: comments addressed 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/clients/mojo_cdm.h ('k') | media/mojo/clients/mojo_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/clients/mojo_cdm.cc
diff --git a/media/mojo/clients/mojo_cdm.cc b/media/mojo/clients/mojo_cdm.cc
index 805cbcbac6b901143781728f5887cf9fcf6ee5f8..41958e7e8379b5cd7d3b2b925c390f0683a78002 100644
--- a/media/mojo/clients/mojo_cdm.cc
+++ b/media/mojo/clients/mojo_cdm.cc
@@ -28,8 +28,8 @@ namespace media {
template <typename PromiseType>
static void RejectPromise(std::unique_ptr<PromiseType> promise,
mojom::CdmPromiseResultPtr result) {
- promise->reject(static_cast<MediaKeys::Exception>(result->exception),
- result->system_code, result->error_message);
+ promise->reject(result->exception, result->system_code,
+ result->error_message);
}
// static
@@ -153,10 +153,9 @@ void MojoCdm::CreateSessionAndGenerateRequest(
DCHECK(thread_checker_.CalledOnValidThread());
remote_cdm_->CreateSessionAndGenerateRequest(
- static_cast<mojom::ContentDecryptionModule::SessionType>(session_type),
- static_cast<mojom::ContentDecryptionModule::InitDataType>(init_data_type),
- init_data, base::Bind(&MojoCdm::OnNewSessionCdmPromiseResult,
- base::Unretained(this), base::Passed(&promise)));
+ session_type, init_data_type, init_data,
+ base::Bind(&MojoCdm::OnNewSessionCdmPromiseResult, base::Unretained(this),
+ base::Passed(&promise)));
}
void MojoCdm::LoadSession(SessionType session_type,
@@ -166,9 +165,9 @@ void MojoCdm::LoadSession(SessionType session_type,
DCHECK(thread_checker_.CalledOnValidThread());
remote_cdm_->LoadSession(
- static_cast<mojom::ContentDecryptionModule::SessionType>(session_type),
- session_id, base::Bind(&MojoCdm::OnNewSessionCdmPromiseResult,
- base::Unretained(this), base::Passed(&promise)));
+ session_type, session_id,
+ base::Bind(&MojoCdm::OnNewSessionCdmPromiseResult, base::Unretained(this),
+ base::Passed(&promise)));
}
void MojoCdm::UpdateSession(const std::string& session_id,
@@ -235,13 +234,12 @@ int MojoCdm::GetCdmId() const {
}
void MojoCdm::OnSessionMessage(const std::string& session_id,
- mojom::CdmMessageType message_type,
+ MessageType message_type,
const std::vector<uint8_t>& message) {
DVLOG(2) << __FUNCTION__;
DCHECK(thread_checker_.CalledOnValidThread());
- session_message_cb_.Run(
- session_id, static_cast<MediaKeys::MessageType>(message_type), message);
+ session_message_cb_.Run(session_id, message_type, message);
}
void MojoCdm::OnSessionClosed(const std::string& session_id) {
« no previous file with comments | « media/mojo/clients/mojo_cdm.h ('k') | media/mojo/clients/mojo_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698