Desktop Capture Picker New UI: Preliminary Refactor

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"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/browser/media/combined_desktop_media_list.h"
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/components_strings.h"
@@ skipping 364 matching lines @@
   OnSelectionChanged();
   OnDoubleClick();
 }
 
 DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
     content::WebContents* parent_web_contents,
     gfx::NativeWindow context,
     DesktopMediaPickerViews* parent,
     const base::string16& app_name,
     const base::string16& target_name,
-    std::unique_ptr<DesktopMediaList> media_list,
+    std::unique_ptr<DesktopMediaList> screen_list,
+    std::unique_ptr<DesktopMediaList> window_list,
+    std::unique_ptr<DesktopMediaList> tab_list,
     bool request_audio)
     : parent_(parent),
       app_name_(app_name),
       description_label_(new views::Label()),
       audio_share_checkbox_(nullptr),
       audio_share_checked_(true),
-      sources_scroll_view_(views::ScrollView::CreateScrollViewWithBorder()),
-      sources_list_view_(
-          new DesktopMediaListView(this, std::move(media_list))) {
+      sources_scroll_view_(views::ScrollView::CreateScrollViewWithBorder()) {
+  std::vector<std::unique_ptr<DesktopMediaList>> media_lists;
+  if (screen_list)
+    media_lists.push_back(std::move(screen_list));
+  if (window_list)
+    media_lists.push_back(std::move(window_list));
+  if (tab_list)
+    media_lists.push_back(std::move(tab_list));
+
+  std::unique_ptr<DesktopMediaList> media_list;
+  if (media_lists.size() > 1)
+    media_list.reset(new CombinedDesktopMediaList(media_lists));
+  else
+    media_list = std::move(media_lists[0]);

[Sergey Ulanov, 2016/04/14 22:39:52]

DCHECK that media_lists is not empty.

[qiangchen, 2016/04/15 20:11:27]

Done.

+
+  sources_list_view_ = new DesktopMediaListView(this, std::move(media_list));
+
   // TODO(estade): we should be getting the inside-border spacing by default as
   // a DialogDelegateView subclass, via default BubbleFrameView content margins.
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, views::kButtonHEdgeMarginNew,
       views::kPanelVertMargin, views::kLabelToControlVerticalSpacing));
 
   if (app_name == target_name) {
     description_label_->SetText(
         l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TEXT, app_name));
   } else {
@@ skipping 190 matching lines @@
 DesktopMediaPickerViews::DesktopMediaPickerViews() : dialog_(NULL) {
 }
 
 DesktopMediaPickerViews::~DesktopMediaPickerViews() {
   if (dialog_) {
     dialog_->DetachParent();
     dialog_->GetWidget()->Close();
   }
 }
 
-void DesktopMediaPickerViews::Show(content::WebContents* web_contents,
-                                   gfx::NativeWindow context,
-                                   gfx::NativeWindow parent,
-                                   const base::string16& app_name,
-                                   const base::string16& target_name,
-                                   std::unique_ptr<DesktopMediaList> media_list,
-                                   bool request_audio,
-                                   const DoneCallback& done_callback) {
+void DesktopMediaPickerViews::Show(
+    content::WebContents* web_contents,
+    gfx::NativeWindow context,
+    gfx::NativeWindow parent,
+    const base::string16& app_name,
+    const base::string16& target_name,
+    std::unique_ptr<DesktopMediaList> screen_list,
+    std::unique_ptr<DesktopMediaList> window_list,
+    std::unique_ptr<DesktopMediaList> tab_list,
+    bool request_audio,
+    const DoneCallback& done_callback) {
   callback_ = done_callback;
   dialog_ = new DesktopMediaPickerDialogView(
-      web_contents, context, this, app_name, target_name, std::move(media_list),
+      web_contents, context, this, app_name, target_name,
+      std::move(screen_list), std::move(window_list), std::move(tab_list),
       request_audio);
 }
 
 void DesktopMediaPickerViews::NotifyDialogResult(DesktopMediaID source) {
   // Once this method is called the |dialog_| will close and destroy itself.
   dialog_->DetachParent();
   dialog_ = NULL;
 
   DCHECK(!callback_.is_null());
 
   // Notify the |callback_| asynchronously because it may need to destroy
   // DesktopMediaPicker.
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 // static
 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }