Desktop chrome tab capture-chooseDesktopMedia()

chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

 // Copyright 2015 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/extensions/api/desktop_capture/desktop_capture_base.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
@@ skipping 11 matching lines @@
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
 
 namespace extensions {
 
 namespace {
 
 const char kInvalidSourceNameError[] = "Invalid source type specified.";
 const char kEmptySourcesListError[] =
     "At least one source type must be specified.";
-const char kTabCaptureNotSupportedError[] = "Tab capture is not supported yet.";
 
 DesktopCaptureChooseDesktopMediaFunctionBase::PickerFactory* g_picker_factory =
     NULL;
 
 }  // namespace
 
 // static
 void DesktopCaptureChooseDesktopMediaFunctionBase::SetPickerFactoryForTests(
     PickerFactory* factory) {
   g_picker_factory = factory;
@@ skipping 26 matching lines @@
 bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
     const std::vector<api::desktop_capture::DesktopCaptureSourceType>& sources,
     content::WebContents* web_contents,
     const GURL& origin,
     const base::string16 target_name) {
   // Register to be notified when the tab is closed.
   Observe(web_contents);
 
   bool show_screens = false;
   bool show_windows = false;
+  bool show_tabs = false;
 
   for (auto source_type : sources) {
     switch (source_type) {
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_NONE:
         error_ = kInvalidSourceNameError;
         return false;
 
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_SCREEN:
         show_screens = true;
         break;
 
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_WINDOW:
         show_windows = true;
         break;
 
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_TAB:
-        error_ = kTabCaptureNotSupportedError;
-        return false;
+        show_tabs = true;

[Sergey Ulanov, 2016/01/13 19:06:11]

tab capture is still not implemented yet. leave this change for later, when the
feature is fully implemented.

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

Done.

+        break;
     }
   }
 
-  if (!show_screens && !show_windows) {
+  if (!show_screens && !show_windows && !show_tabs) {
     error_ = kEmptySourcesListError;
     return false;
   }
 
   const gfx::NativeWindow parent_window =
       web_contents->GetTopLevelNativeWindow();
   scoped_ptr<DesktopMediaList> media_list;
   if (g_picker_factory) {
     media_list = g_picker_factory->CreateModel(
         show_screens, show_windows);
     picker_ = g_picker_factory->CreatePicker();
   } else {
 #if defined(USE_ASH)
+    const int source_types = (show_screens ? DesktopMediaListAsh::SCREENS : 0) |

[Sergey Ulanov, 2016/01/13 19:06:11]

Move this inside the if statement below, but I'm not sure if you need this at
all.

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

Done.

+                             (show_windows ? DesktopMediaListAsh::WINDOWS : 0);
     if (chrome::IsNativeWindowInAsh(parent_window)) {
-      media_list.reset(new DesktopMediaListAsh(
-          (show_screens ? DesktopMediaListAsh::SCREENS : 0) |
-          (show_windows ? DesktopMediaListAsh::WINDOWS : 0)));
+      media_list.reset(new DesktopMediaListAsh(source_types));
     }
 #endif
     if (!media_list) {
       webrtc::DesktopCaptureOptions options =
           webrtc::DesktopCaptureOptions::CreateDefault();
       options.set_disable_effects(false);
       scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
           show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
       scoped_ptr<webrtc::WindowCapturer> window_capturer(
           show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
-
-      media_list.reset(new NativeDesktopMediaList(std::move(screen_capturer),
-                                                  std::move(window_capturer)));
+      media_list.reset(new NativeDesktopMediaList(
+          std::move(screen_capturer), std::move(window_capturer)));
     }
 
     // DesktopMediaPicker is implemented only for Windows, OSX and
     // Aura Linux builds.
     // TODO(bshe): Use ANDROID_JAVA_UI flag here after it landed.
 #if (defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID)) || defined(OS_MACOSX)
     // TODO(bshe): This is called if chrome.desktopCapture.chooseDesktopMedia
     // or chrome.webrtcDesktopCapturePrivate.chooseDesktopMedia are called by
     // extensions. Simply return error message on Android platform for now.
     // Revisit this when necessary. See crbug.com/557424.
@@ skipping 93 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions