content/browser/media/capture/web_contents_audio_input_stream.cc - Issue 757033005: Make tab audible and muted states and cause available for an extension API

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/media/capture/web_contents_audio_input_stream.cc

Issue 757033005: Make tab audible and muted states and cause available for an extension API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: MutedToggleCause --> muted_toggle_cause Created 6 years 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/browser/ui/tabs/tab_utils.cc ('K') | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/web_contents_audio_input_stream.cc

diff --git a/content/browser/media/capture/web_contents_audio_input_stream.cc b/content/browser/media/capture/web_contents_audio_input_stream.cc

index 605124dd30848e20e6223c7f143baaa9e8003a0e..986307808485a2ca51fa0678b9b8cd229739e1c8 100644

--- a/content/browser/media/capture/web_contents_audio_input_stream.cc

+++ b/content/browser/media/capture/web_contents_audio_input_stream.cc

@@ -23,6 +23,10 @@

namespace content {

+// String to indicate that muted state change was caused by capture

+// (instead of initial, user or an extension id).

+static const char kMutedToggleCauseCapture[] = "auto-forced for capture";

class WebContentsAudioInputStream::Impl

: public base::RefCountedThreadSafe<WebContentsAudioInputStream::Impl>,

public AudioMirroringManager::MirroringDestination {

@@ -251,7 +255,7 @@ void WebContentsAudioInputStream::Impl::UnmuteWebContentsAudio() {

WebContents* const contents = tracker_->web_contents();

if (contents)

- contents->SetAudioMuted(false);

+ contents->SetAudioMuted(false, kMutedToggleCauseCapture);

}

void WebContentsAudioInputStream::Impl::QueryForMatches(