content/public/browser/desktop_media_id.cc - Issue 2291893002: Let Contraints Controll Mute/Unmute Audio Local Playback For Desktop Sharing

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/desktop_media_id.cc

Issue 2291893002: Let Contraints Controll Mute/Unmute Audio Local Playback For Desktop Sharing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 3 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/renderer_host/media/media_stream_manager.cc ('K') | « content/common/media/media_stream_options.h ('k') | content/public/browser/web_contents_media_capture_id.h » ('j') | content/public/browser/web_contents_media_capture_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/browser/desktop_media_id.cc

diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc

index 8a20598af67f82db03a1dffad8601597df05d1c3..ce34a7c4aeb9c48c7427c0c09a8f0e3df23ee3e2 100644

--- a/content/public/browser/desktop_media_id.cc

+++ b/content/public/browser/desktop_media_id.cc

@@ -129,8 +129,8 @@ bool DesktopMediaID::operator==(const DesktopMediaID& other) const {

// window:"window_id:aura_id".

DesktopMediaID DesktopMediaID::Parse(const std::string& str) {

// For WebContents type.

- WebContentsMediaCaptureId web_id = WebContentsMediaCaptureId::Parse(str);

- if (!web_id.is_null())

+ WebContentsMediaCaptureId web_id;

+ if (WebContentsMediaCaptureId::TryParse(str, &web_id))

return DesktopMediaID(TYPE_WEB_CONTENTS, 0, web_id);

// For screen and window types.