chrome/browser/ui/views/desktop_media_picker_views.cc - Issue 1503563004: Desktop chrome tab capture-chooseDesktopMedia()

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: chrome/browser/ui/views/desktop_media_picker_views.cc

Issue 1503563004: Desktop chrome tab capture-chooseDesktopMedia() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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:

Index: chrome/browser/ui/views/desktop_media_picker_views.cc

diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc

index 1c89f35c3111bef1979e766d7532d03ac60b5733..821e4731177c2a752ad534214d6d0db3b108c65b 100644

--- a/chrome/browser/ui/views/desktop_media_picker_views.cc

+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc

@@ -523,7 +523,10 @@ bool DesktopMediaPickerDialogView::Accept() {

if (selection)

source = selection->source_id();

- if (parent_)

+ // Disable tab capture.

+ // TODO(gyzhou): remove the line of the code begins with if after tab capture

+ // is implemented for javascript Navigator.getUserMedia().

+ if (parent_ && source.type != DesktopMediaID::TYPE_WEB_CONTENTS)

Sergey Ulanov 2016/01/13 19:06:11 This would be confusing behavior. It would be bett

GeorgeZ 2016/01/13 22:29:02 Done.

parent_->NotifyDialogResult(source);

// Return true to close the window.