content/browser/web_contents/web_contents_impl.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/browser/web_contents/web_contents_impl.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/browser/media/session/mock_media_session_observer.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.h

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

index 0cd1ecb1694da3fb3f9407ae85d24efbccc327c2..31230ffa7b6f2fc210c631493ba94c2cbd99779c 100644

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

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

@@ -382,12 +382,12 @@ class CONTENT_EXPORT WebContentsImpl

void HasManifest(const HasManifestCallback& callback) override;

void ExitFullscreen(bool will_cause_resize) override;

void ResumeLoadingCreatedWebContents() override;

-#if defined(OS_ANDROID)

void OnMediaSessionStateChanged();

void ResumeMediaSession() override;

void SuspendMediaSession() override;

void StopMediaSession() override;

+#if defined(OS_ANDROID)

base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() override;

virtual WebContentsAndroid* GetWebContentsAndroid();

#elif defined(OS_MACOSX)