content/browser/web_contents/web_contents_impl.cc - Issue 896673003: Propagate audible state from player to the containing tab

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 896673003: Propagate audible state from player to the containing tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed MediaSourcePlayerTest compilation. Created 5 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/media_web_contents_observer.cc ('K') | « content/browser/media/media_web_contents_observer.cc ('k') | content/content_browser.gypi » ('j') | media/base/android/media_player_bridge.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 bb0546483a7a9c84bfcbc6a0ef90d87647996021..f7dfab84273d8fd76c3097e31031748ee5c1350a 100644

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

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

@@ -2530,7 +2530,11 @@ void WebContentsImpl::InsertCSS(const std::string& css) {

}

bool WebContentsImpl::WasRecentlyAudible() {

+#if defined(ENABLE_BROWSER_CDMS)

Ted C 2015/02/07 00:07:15 or if we don't want to make the method ifdef'd to

Tima Vaisburd 2015/02/07 03:00:23 Yes, I put it under #if defined(ENABLE_BROWSER_

+ return media_web_contents_observer_->IsAudible();

+#else

return audio_stream_monitor_.WasRecentlyAudible();

+#endif

}

void WebContentsImpl::GetManifest(const GetManifestCallback& callback) {