Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Issues Search
    My Issues | Starred     Open | Closed | All

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 3 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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/browser_finder.cc ('K') | « chrome/browser/ui/browser_finder.cc ('k') | chrome/chrome_browser.gypi » ('j') | chrome/common/extensions/docs/examples/api/desktopCapture/app.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4648784c783979063e4f554c8be2738299a43993 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -521,7 +521,9 @@ bool DesktopMediaPickerDialogView::Accept() {
if (selection)
source = selection->source_id();
- if (parent_)
+ // Temporarily block tab capture.
+ // Tab capture will be enabled by next CL for it.
msw 2015/12/15 21:30:09 nit: remove this line; maybe note something simila
GeorgeZ 2015/12/16 00:07:39 Done.
+ if (parent_ && source.type != DesktopMediaID::TYPE_TAB)
parent_->NotifyDialogResult(source);
// Return true to close the window.
« chrome/browser/ui/browser_finder.cc ('K') | « chrome/browser/ui/browser_finder.cc ('k') | chrome/chrome_browser.gypi » ('j') | chrome/common/extensions/docs/examples/api/desktopCapture/app.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698