content/browser/web_contents/web_contents_impl.cc - Issue 2060933002: Let Flash join and be controlled by media 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: content/browser/web_contents/web_contents_impl.cc

Issue 2060933002: Let Flash join and be controlled by media session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pepper_to_contents

Patch Set: modified when to add/remove player to/from MediaSession Created 4 years, 6 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

« content/browser/media/session/pepper/pepper_web_contents_observer.cc ('K') | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/frame_messages.h » ('j') | content/renderer/render_frame_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 775479174508804f107bf40c913a805590a1ccca..fc02b25e97cc43509ae7f1b7b9f1a3f7aff65715 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -3700,12 +3700,14 @@ void WebContentsImpl::OnWebUISend(const GURL& source_url,

}

#if defined(ENABLE_PLUGINS)

-void WebContentsImpl::OnPepperInstanceCreated() {

- FOR_EACH_OBSERVER(WebContentsObserver, observers_, PepperInstanceCreated());

+void WebContentsImpl::OnPepperInstanceCreated(int32_t pp_instance) {

+ FOR_EACH_OBSERVER(WebContentsObserver, observers_,

+ PepperInstanceCreated(pp_instance));

}

-void WebContentsImpl::OnPepperInstanceDeleted() {

- FOR_EACH_OBSERVER(WebContentsObserver, observers_, PepperInstanceDeleted());

+void WebContentsImpl::OnPepperInstanceDeleted(int32_t pp_instance) {

+ FOR_EACH_OBSERVER(WebContentsObserver, observers_,

+ PepperInstanceDeleted(pp_instance));

}

void WebContentsImpl::OnPepperPluginHung(int plugin_child_id,