content/browser/web_contents/web_contents_impl.cc - Issue 1159113006: [Android] A prototype of the interactive media notification.

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 1159113006: [Android] A prototype of the interactive media notification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments and nits Created 5 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

« chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaInfo.java ('K') | « content/browser/web_contents/web_contents_impl.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
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 bb74c49a04addec14c21c8ed850b81420a3654ae..4741cb7ad325044de822bc08568d47f6def1e85c 100644

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

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

@@ -115,6 +115,7 @@

#include "content/browser/android/date_time_chooser_android.h"

#include "content/browser/android/media_players_observer.h"

#include "content/browser/media/android/browser_media_player_manager.h"

+#include "content/browser/media/android/media_session.h"

#include "content/browser/web_contents/web_contents_android.h"

#endif

@@ -4248,6 +4249,10 @@ bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() {

frame_tree_.root()->current_replication_state(), true);

}

+MediaControlsDelegate* WebContentsImpl::GetMediaControlsDelegate() {

+ return MediaSession::Get(this);

#elif defined(OS_MACOSX)

void WebContentsImpl::SetAllowOtherViews(bool allow) {