content/common/content_message_generator.h - Issue 295103015: Separate RendererCdmManager from RendererMediaPlayerManager.

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: content/common/content_message_generator.h

Issue 295103015: Separate RendererCdmManager from RendererMediaPlayerManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again Created 6 years, 7 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: content/common/content_message_generator.h

diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h

index f9dfef1a4d2364a3241c2c4497b6f54ef02f8b28..dd0f096459b1f217e9c6e771488690a0cde38cd4 100644

--- a/content/common/content_message_generator.h

+++ b/content/common/content_message_generator.h

@@ -32,6 +32,8 @@

#include "content/common/input_messages.h"

#include "content/common/java_bridge_messages.h"

#include "content/common/media/audio_messages.h"

+// TODO(xhwang): Move this to a new ifdef block.

+#include "content/common/media/cdm_messages.h"

#include "content/common/media/media_stream_messages.h"

#include "content/common/media/media_stream_track_metrics_host_messages.h"

#include "content/common/media/midi_messages.h"

@@ -62,6 +64,5 @@

#if defined(OS_ANDROID)

#include "content/common/gin_java_bridge_messages.h"

-#include "content/common/media/cdm_messages.h"

#include "content/common/media/media_player_messages_android.h"

#endif // defined(OS_ANDROID)

« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | no next file with comments »