Desktop Capture Picker New UI: Non Mac Appearance Change

chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h

Index: chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h
index 540304ec00507774facdec4da30b57f4389e557e..0e79dba86cd106cc4e07dbdd917988fe1d9093b2 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_LIST_VIEW_H_
 
 #include "chrome/browser/media/desktop_media_list_observer.h"
+#include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
 #include "content/public/browser/desktop_media_id.h"
 #include "ui/views/view.h"
 
 class DesktopMediaPickerDialogView;
-class DesktopMediaSourceView;
 
 // View that shows a list of desktop media sources available from
 // DesktopMediaList.
@@ -18,7 +18,9 @@ class DesktopMediaListView : public views::View,
                              public DesktopMediaListObserver {
  public:
   DesktopMediaListView(DesktopMediaPickerDialogView* parent,
-                       std::unique_ptr<DesktopMediaList> media_list);
+                       std::unique_ptr<DesktopMediaList> media_list,
+                       DesktopMediaSourceViewStyle single_style,

[msw, 2016/05/20 23:26:36]

The only single-style is for the screen picker, and the styles aren't terribly
different (title vs. no-title, and minor size difference). I'd argue that the
nuanced appearance for a single-screen doesn't warrant this code complexity, and
we should only support a generic style, and *maybe* find some way to support
dropping the title in the single-screen case. WDYT?

[qiangchen, 2016/05/24 00:03:37]

Done.

[msw, 2016/05/24 18:54:25]

I meant that we should remove |single_style| altogether.

+                       DesktopMediaSourceViewStyle generic_style);
   ~DesktopMediaListView() override;
 
   void StartUpdating(content::DesktopMediaID dialog_window_id);
@@ -52,6 +54,10 @@ class DesktopMediaListView : public views::View,
 
   DesktopMediaPickerDialogView* parent_;
   std::unique_ptr<DesktopMediaList> media_list_;
+
+  DesktopMediaSourceViewStyle single_style_;
+  DesktopMediaSourceViewStyle generic_style_;
+
   base::WeakPtrFactory<DesktopMediaListView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaListView);