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: review round 4 Created 5 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:

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 f1741ed74cf8b34f92745e5b498a4f64a2f94bfe..96c1ac3358066dc68c3d14944e0c9f95d9bbfb14 100644

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

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

@@ -521,7 +521,8 @@ bool DesktopMediaPickerDialogView::Accept() {

if (selection)

source = selection->source_id();

- if (parent_)

+ // Temporarily disable tab capture. This will be enabled later.

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

parent_->NotifyDialogResult(source);

// Return true to close the window.