media/mojo/services/mojo_cdm_service.cc - Issue 1209283003: FrameMojoShell provides services to mojo apps.

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_cdm_service.cc

Issue 1209283003: FrameMojoShell provides services to mojo apps. (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_cdm_service.cc

diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc

index 25f325547874cab57238fca9e5340410963173b3..9335f3fdbe82ffdcbb5209ab0f0ce8f1ac420786 100644

--- a/media/mojo/services/mojo_cdm_service.cc

+++ b/media/mojo/services/mojo_cdm_service.cc

@@ -22,9 +22,11 @@ typedef MojoCdmPromise<std::string> NewSessionMojoCdmPromise;

MojoCdmService::MojoCdmService(

MojoCdmServiceContext* context,

+ mojo::ServiceProvider* service_provider,

mojo::InterfaceRequest<mojo::ContentDecryptionModule> request)

: binding_(this, request.Pass()),

context_(context),

+ service_provider_(service_provider),

cdm_id_(CdmContext::kInvalidCdmId),

weak_factory_(this) {

}