media/mojo/services/mojo_media_application.h - Issue 1231623003: media: Support CdmFactory in MojoMediaClient.

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/mojo/services/mojo_media_application.h

Issue 1231623003: media: Support CdmFactory in MojoMediaClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 5 years, 5 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/mojo/services/mojo_media_application.h

diff --git a/media/mojo/services/mojo_media_application.h b/media/mojo/services/mojo_media_application.h

index 59538a7e8612d1f847b1b6f2e4afa76d022bd878..b1dcede54d8f117a0d36f7d09a8245781a16f2b2 100644

--- a/media/mojo/services/mojo_media_application.h

+++ b/media/mojo/services/mojo_media_application.h

@@ -12,6 +12,7 @@

namespace media {

+class CdmFactory;

class MediaLog;

class RendererFactory;

@@ -42,9 +43,11 @@ class MojoMediaApplication

mojo::InterfaceRequest<mojo::MediaRenderer> request) final;

RendererFactory* GetRendererFactory();

+ CdmFactory* GetCdmFactory();

MojoCdmServiceContext cdm_service_context_;

scoped_ptr<RendererFactory> renderer_factory_;

+ scoped_ptr<CdmFactory> cdm_factory_;

scoped_refptr<MediaLog> media_log_;

};