media/base/ipc/media_param_traits_macros.h - Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/ipc/media_param_traits_macros.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:

Index: media/base/ipc/media_param_traits_macros.h

diff --git a/media/base/ipc/media_param_traits_macros.h b/media/base/ipc/media_param_traits_macros.h

index f7d1e7400b18f0a4ebabf036bcf8c53630f02db7..1c599219c5f870b49fb452796f3a1f7a116af331 100644

--- a/media/base/ipc/media_param_traits_macros.h

+++ b/media/base/ipc/media_param_traits_macros.h

@@ -10,6 +10,7 @@

#include "media/base/audio_parameters.h"

#include "media/base/buffering_state.h"

#include "media/base/cdm_key_information.h"

+#include "media/base/cdm_promise.h"

#include "media/base/channel_layout.h"

#include "media/base/decode_status.h"

#include "media/base/decryptor.h"

@@ -63,8 +64,8 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::EmeInitDataType, media::EmeInitDataType::MAX)

IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,

media::EncryptionScheme::CipherMode::CIPHER_MODE_MAX)

-IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::Exception,

- media::MediaKeys::EXCEPTION_MAX)

+IPC_ENUM_TRAITS_MAX_VALUE(media::CdmPromise::Exception,

+ media::CdmPromise::EXCEPTION_MAX)

IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::MessageType,

media::MediaKeys::MESSAGE_TYPE_MAX)

« no previous file with comments | « media/base/cdm_promise_adapter.cc ('k') | media/base/media_keys.h » ('j') | no next file with comments »