Desktop Capture Picker New UI: Preliminary Refactor

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/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/media/combined_desktop_media_list.h"
 #include "chrome/browser/media/desktop_media_list_ash.h"
 #include "chrome/browser/media/desktop_streams_registry.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/native_desktop_media_list.h"
 #include "chrome/browser/media/tab_desktop_media_list.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/common/channel_info.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 94 matching lines @@
     }
   }
 
   if (!show_screens && !show_windows && !show_tabs) {
     error_ = kEmptySourcesListError;
     return false;
   }
 
   const gfx::NativeWindow parent_window =
       web_contents->GetTopLevelNativeWindow();
-  std::unique_ptr<DesktopMediaList> media_list;
+  std::unique_ptr<DesktopMediaList> screen_list;
+  std::unique_ptr<DesktopMediaList> window_list;
+  std::unique_ptr<DesktopMediaList> tab_list;
   if (g_picker_factory) {
-    media_list = g_picker_factory->CreateModel(show_screens, show_windows,
-                                               show_tabs, request_audio);
+    std::vector<std::unique_ptr<DesktopMediaList>> media_lists;
+    media_lists = g_picker_factory->CreateModel(show_screens, show_windows,

[msw, 2016/04/13 00:04:02]

nit: combine this assignment statement with the decl above.

[qiangchen, 2016/04/14 17:08:40]

Done.

+                                                show_tabs, request_audio);
+    screen_list = std::move(media_lists[0]);
+    window_list = std::move(media_lists[1]);
+    tab_list = std::move(media_lists[2]);
     picker_ = g_picker_factory->CreatePicker();
   } else {
-    std::vector<std::unique_ptr<DesktopMediaList>> media_lists;
-    // Create a screens/windows list and push it into media_lists.
-    if (show_screens || show_windows) {
+    // Create a screens list.
+    if (show_screens) {
 #if defined(USE_ASH)
       if (chrome::IsNativeWindowInAsh(parent_window)) {
-        media_lists.push_back(base::WrapUnique(new DesktopMediaListAsh(
-            (show_screens ? DesktopMediaListAsh::SCREENS : 0) |
-            (show_windows ? DesktopMediaListAsh::WINDOWS : 0))));
+        screen_list = base::WrapUnique(
+            new DesktopMediaListAsh(DesktopMediaListAsh::SCREENS));
       }
 #endif
-      if (media_lists.empty()) {
+      if (!screen_list) {
         webrtc::DesktopCaptureOptions options =
             webrtc::DesktopCaptureOptions::CreateDefault();
         options.set_disable_effects(false);
         std::unique_ptr<webrtc::ScreenCapturer> screen_capturer(
-            show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
+            webrtc::ScreenCapturer::Create(options));
+
+        screen_list = base::WrapUnique(
+            new NativeDesktopMediaList(std::move(screen_capturer), nullptr));
+      }
+    }
+
+    // Create a windows list.
+    if (show_windows) {
+#if defined(USE_ASH)
+      if (chrome::IsNativeWindowInAsh(parent_window)) {
+        window_list = base::WrapUnique(
+            new DesktopMediaListAsh(DesktopMediaListAsh::WINDOWS));
+      }
+#endif
+      if (!window_list) {
+        webrtc::DesktopCaptureOptions options =
+            webrtc::DesktopCaptureOptions::CreateDefault();
+        options.set_disable_effects(false);
         std::unique_ptr<webrtc::WindowCapturer> window_capturer(
-            show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
+            webrtc::WindowCapturer::Create(options));
 
-        media_lists.push_back(base::WrapUnique(new NativeDesktopMediaList(
-            std::move(screen_capturer), std::move(window_capturer))));
+        window_list = base::WrapUnique(
+            new NativeDesktopMediaList(nullptr, std::move(window_capturer)));
       }
     }
 
     if (show_tabs)
-      media_lists.push_back(base::WrapUnique(new TabDesktopMediaList()));
+      tab_list = base::WrapUnique(new TabDesktopMediaList());
 
-    DCHECK(!media_lists.empty());
-
-    if (media_lists.size() == 1) {
-      media_list = std::move(media_lists[0]);
-    } else {
-      media_list.reset(new CombinedDesktopMediaList(media_lists));
-    }
+    DCHECK(screen_list || window_list || tab_list);
 
     // DesktopMediaPicker is implemented only for Windows, OSX and
     // Aura Linux builds.
 #if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
     picker_ = DesktopMediaPicker::Create();
 #else
     error_ = "Desktop Capture API is not yet implemented for this platform.";
     return false;
 #endif
   }
 
   DesktopMediaPicker::DoneCallback callback = base::Bind(
       &DesktopCaptureChooseDesktopMediaFunctionBase::OnPickerDialogResults,
       this);
 
   picker_->Show(web_contents, parent_window, parent_window,
                 base::UTF8ToUTF16(extension()->name()), target_name,
-                std::move(media_list), request_audio, callback);
+                std::move(screen_list), std::move(window_list),
+                std::move(tab_list), request_audio, callback);
   origin_ = origin;
   return true;
 }
 
 void DesktopCaptureChooseDesktopMediaFunctionBase::WebContentsDestroyed() {
   Cancel();
 }
 
 void DesktopCaptureChooseDesktopMediaFunctionBase::OnPickerDialogResults(
     content::DesktopMediaID source) {
@@ skipping 70 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