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

Unified Diff: media/remoting/rpc/proto_enum_utils.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/remoting/proto/remoting_rpc_message.proto ('k') | media/remoting/rpc/proto_enum_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/remoting/rpc/proto_enum_utils.h
diff --git a/media/remoting/rpc/proto_enum_utils.h b/media/remoting/rpc/proto_enum_utils.h
index 62af79be18c092162ea2415f0bd1ab348b87417e..b59605bc7f0d418cdca5e906920e465b11dbe24b 100644
--- a/media/remoting/rpc/proto_enum_utils.h
+++ b/media/remoting/rpc/proto_enum_utils.h
@@ -8,6 +8,7 @@
#include "base/optional.h"
#include "media/base/audio_codecs.h"
#include "media/base/cdm_key_information.h"
+#include "media/base/cdm_promise.h"
#include "media/base/channel_layout.h"
#include "media/base/demuxer_stream.h"
#include "media/base/encryption_scheme.h"
@@ -74,10 +75,10 @@ ToMediaCdmKeyInformationKeyStatus(pb::CdmKeyInformation::KeyStatus value);
base::Optional<pb::CdmKeyInformation::KeyStatus> ToProtoCdmKeyInformation(
::media::CdmKeyInformation::KeyStatus value);
-base::Optional<::media::MediaKeys::Exception> ToMediaMediaKeysException(
+base::Optional<::media::CdmPromise::Exception> ToCdmPromiseException(
pb::MediaKeysException value);
base::Optional<pb::MediaKeysException> ToProtoMediaKeysException(
- ::media::MediaKeys::Exception value);
+ ::media::CdmPromise::Exception value);
base::Optional<::media::MediaKeys::MessageType> ToMediaMediaKeysMessageType(
pb::MediaKeysMessageType value);
« no previous file with comments | « media/remoting/proto/remoting_rpc_message.proto ('k') | media/remoting/rpc/proto_enum_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698