components/cdm/common/cdm_messages_android.h - Issue 665343002: Move KeySystemInfo to media.

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: components/cdm/common/cdm_messages_android.h

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 6 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: components/cdm/common/cdm_messages_android.h

diff --git a/components/cdm/common/cdm_messages_android.h b/components/cdm/common/cdm_messages_android.h

index 8e0ad1cb4c3b08aea9aca46205d0b77acefcb7a8..028306ac35ba6047a9dbe027c8c3746fb92b9d2d 100644

--- a/components/cdm/common/cdm_messages_android.h

+++ b/components/cdm/common/cdm_messages_android.h

@@ -7,24 +7,24 @@

#include <vector>

-#include "content/public/common/eme_constants.h"

#include "ipc/ipc_message_macros.h"

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

#define IPC_MESSAGE_START EncryptedMediaMsgStart

IPC_STRUCT_BEGIN(SupportedKeySystemRequest)

IPC_STRUCT_MEMBER(std::string, key_system)

- IPC_STRUCT_MEMBER(content::SupportedCodecs, codecs, content::EME_CODEC_NONE)

+ IPC_STRUCT_MEMBER(media::SupportedCodecs, codecs, media::EME_CODEC_NONE)

IPC_STRUCT_END()

IPC_STRUCT_BEGIN(SupportedKeySystemResponse)

IPC_STRUCT_MEMBER(std::string, key_system)

- IPC_STRUCT_MEMBER(content::SupportedCodecs,

+ IPC_STRUCT_MEMBER(media::SupportedCodecs,

compositing_codecs,

- content::EME_CODEC_NONE)

- IPC_STRUCT_MEMBER(content::SupportedCodecs,

+ media::EME_CODEC_NONE)

+ IPC_STRUCT_MEMBER(media::SupportedCodecs,

non_compositing_codecs,

- content::EME_CODEC_NONE)

+ media::EME_CODEC_NONE)

IPC_STRUCT_END()

// Messages sent from the renderer to the browser.