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

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: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media/native_desktop_media_list_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | content/public/browser/desktop_media_id.cc » ('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 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)
parent_->NotifyDialogResult(source);
// Return true to close the window.
« no previous file with comments | « chrome/browser/media/native_desktop_media_list_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | content/public/browser/desktop_media_id.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698