components/html_viewer/html_frame.cc - Issue 1585163002: Media Session: prepare for implicit activation of user created session

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/html_viewer/html_frame.cc

Issue 1585163002: Media Session: prepare for implicit activation of user created session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Be clearer about session being a media_session Created 4 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: components/html_viewer/html_frame.cc

diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc

index 22f3ca9836ce93fe456cc20806c4b248bf7bdce3..5cf6e2d1ce1e4c888655dae8a5c5c8a36584696b 100644

--- a/components/html_viewer/html_frame.cc

+++ b/components/html_viewer/html_frame.cc

@@ -315,7 +315,8 @@ blink::WebMediaPlayer* HTMLFrame::createMediaPlayer(

blink::WebMediaPlayerClient* client,

blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,

blink::WebContentDecryptionModule* initial_cdm,

- const blink::WebString& sink_id) {

+ const blink::WebString& sink_id,

+ blink::WebMediaSession*) {

jochen (gone - plz use gerrit) 2016/01/25 11:34:54 same here

return global_state()->media_factory()->CreateMediaPlayer(

frame, url, client, encrypted_client, initial_cdm, GetApp()->shell());

}

« no previous file with comments | « components/html_viewer/html_frame.h ('k') | content/renderer/render_frame_impl.h » ('j') | content/renderer/render_frame_impl.cc » ('J')