Desktop chrome tab capture-chooseDesktopMedia()

chrome/browser/ui/views/desktop_media_picker_views.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/desktop_media_picker_views.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 505 matching lines @@
 bool DesktopMediaPickerDialogView::Accept() {
   DesktopMediaSourceView* selection = list_view_->GetSelection();
 
   // Ok button should only be enabled when a source is selected.
   DCHECK(selection);
 
   DesktopMediaID source;
   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 better to keep the feature not
supported, until it's fully implemented. I.e. revert the change in
desktop_capture_base.cc.

[GeorgeZ, 2016/01/13 22:29:02]

Done.

     parent_->NotifyDialogResult(source);
 
   // Return true to close the window.
   return true;
 }
 
 void DesktopMediaPickerDialogView::DeleteDelegate() {
   // If the dialog is being closed then notify the parent about it.
   if (parent_)
     parent_->NotifyDialogResult(DesktopMediaID());
@@ skipping 66 matching lines @@
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 // static
 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }