content/public/browser/web_contents.h - Issue 1698933004: Make MediaSession a runtime-enabled feature on Desktop.

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/public/browser/web_contents.h

Issue 1698933004: Make MediaSession a runtime-enabled feature on Desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments and windows build fix Created 4 years, 10 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/media_session.cc ('K') | « content/public/android/java/src/org/chromium/content/browser/MediaSessionDelegate.java ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/browser/web_contents.h

diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h

index 4f8a3f26c139feb35a84f65b01cf1d0530e1133f..e5d85593110e857e9349d26209ea20b1be85cdff 100644

--- a/content/public/browser/web_contents.h

+++ b/content/public/browser/web_contents.h

@@ -697,7 +697,6 @@ class WebContents : public PageNavigator,

// as soon as they are ready.

virtual void ResumeLoadingCreatedWebContents() = 0;

-#if defined(OS_ANDROID)

// Requests to resume the current media session.

virtual void ResumeMediaSession() = 0;

// Requests to suspend the current media session.

@@ -705,6 +704,7 @@ class WebContents : public PageNavigator,

// Requests to stop the current media session.

virtual void StopMediaSession() = 0;

+#if defined(OS_ANDROID)

CONTENT_EXPORT static WebContents* FromJavaWebContents(

jobject jweb_contents_android);

virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() = 0;