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..6ec55d7186fc999957c92430de73a9d020d9da4f 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,14 @@ class DesktopMediaListView : public views::View,
                              public DesktopMediaListObserver {
  public:
   DesktopMediaListView(DesktopMediaPickerDialogView* parent,
-                       std::unique_ptr<DesktopMediaList> media_list);
+                       std::unique_ptr<DesktopMediaList> media_list,
+                       DesktopMediaSourceViewStyle generic_style);
+
+  DesktopMediaListView(DesktopMediaPickerDialogView* parent,
+                       std::unique_ptr<DesktopMediaList> media_list,
+                       DesktopMediaSourceViewStyle generic_style,
+                       DesktopMediaSourceViewStyle single_style);
+
   ~DesktopMediaListView() override;
 
   void StartUpdating(content::DesktopMediaID dialog_window_id);
@@ -50,8 +57,19 @@ class DesktopMediaListView : public views::View,
   // Accepts whatever happens to be selected right now.
   void AcceptSelection();
 
+  // Change the source style of this list on the fly.
+  void SwitchStyle(DesktopMediaSourceViewStyle* style);

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

nit: SetStyle (but I hope we can just have one style...)

[qiangchen, 2016/05/25 16:24:08]

Done.

+
+  static DesktopMediaSourceViewStyle kSingleScreenStyle;

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

Remove this, it's unused.

[qiangchen, 2016/05/25 16:24:08]

Done.

+
   DesktopMediaPickerDialogView* parent_;
   std::unique_ptr<DesktopMediaList> media_list_;
+
+  DesktopMediaSourceViewStyle single_style_;
+  DesktopMediaSourceViewStyle generic_style_;
+  bool use_single_style_;

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

This is not what I meant for using a single style... I meant that the list
shouldn't support a separate style struct for when there is only one item in the
list. It should have a consistent style for a single item and multiple items.
Remove |single_style_|, rename |generic_style_| to |sytle_|, remove
|use_single_style_|, remove |active_style_|, and remove the code that supports
distinct styles for a single item versus multiple items.

If we really need distinct styles; remove |use_single_style_| and replace it
with |active_style_ == &single_style_|...

+  DesktopMediaSourceViewStyle* active_style_;
+
   base::WeakPtrFactory<DesktopMediaListView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaListView);