mojo/services/html_viewer/html_document.cc - Issue 871663003: media: Add MediaPermission interface and MediaPermissionDispatcher.

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: mojo/services/html_viewer/html_document.cc

Issue 871663003: media: Add MediaPermission interface and MediaPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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:

View side-by-side diff with in-line comments

Download patch

Index: mojo/services/html_viewer/html_document.cc

diff --git a/mojo/services/html_viewer/html_document.cc b/mojo/services/html_viewer/html_document.cc

index a692958165c48d5e03acfc819487a340ed8ea757..0e8f25e4180d9569390fa19e45069ace3c010d6a 100644

--- a/mojo/services/html_viewer/html_document.cc

+++ b/mojo/services/html_viewer/html_document.cc

@@ -278,7 +278,7 @@ void HTMLDocument::didNavigateWithinPage(

blink::WebEncryptedMediaClient* HTMLDocument::encryptedMediaClient() {

if (!web_encrypted_media_client_) {

web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(

- make_scoped_ptr(new media::DefaultCdmFactory())));

+ make_scoped_ptr(new media::DefaultCdmFactory()), nullptr));

ddorwin 2015/01/26 23:33:46 TODO?

xhwang 2015/01/27 00:01:58 Done.

}

return web_encrypted_media_client_.get();

}

« media/blink/webencryptedmediaclient_impl.cc ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »