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

Unified Diff: media/remoting/rpc/proto_enum_utils.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/remoting/rpc/proto_enum_utils.h ('k') | media/remoting/rpc/proto_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/remoting/rpc/proto_enum_utils.cc
diff --git a/media/remoting/rpc/proto_enum_utils.cc b/media/remoting/rpc/proto_enum_utils.cc
index 7160458fdea09b57fdd43d3a9c2cdff9fc2a56ac..fc8404ef08a2024e70ecd339c7d36d7136066b48 100644
--- a/media/remoting/rpc/proto_enum_utils.cc
+++ b/media/remoting/rpc/proto_enum_utils.cc
@@ -429,10 +429,10 @@ base::Optional<pb::CdmKeyInformation::KeyStatus> ToProtoCdmKeyInformation(
return base::nullopt; // Not a 'default' to ensure compile-time checks.
}
-base::Optional<::media::MediaKeys::Exception> ToMediaMediaKeysException(
+base::Optional<::media::CdmPromise::Exception> ToCdmPromiseException(
pb::MediaKeysException value) {
using OriginType = pb::MediaKeysException;
- using OtherType = ::media::MediaKeys;
+ using OtherType = ::media::CdmPromise;
switch (value) {
CASE_RETURN_OTHER(NOT_SUPPORTED_ERROR);
CASE_RETURN_OTHER(INVALID_STATE_ERROR);
@@ -446,8 +446,8 @@ base::Optional<::media::MediaKeys::Exception> ToMediaMediaKeysException(
}
base::Optional<pb::MediaKeysException> ToProtoMediaKeysException(
- ::media::MediaKeys::Exception value) {
- using OriginType = ::media::MediaKeys;
+ ::media::CdmPromise::Exception value) {
+ using OriginType = ::media::CdmPromise;
using OtherType = pb::MediaKeysException;
switch (value) {
CASE_RETURN_OTHER(NOT_SUPPORTED_ERROR);
« no previous file with comments | « media/remoting/rpc/proto_enum_utils.h ('k') | media/remoting/rpc/proto_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698