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..194523bb2c6765bfbc48052d156c69e495c0a654 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,

[msw, 2016/05/25 17:22:13]

nit: remove this ctor, passing the same style for single and generic is okay.

[qiangchen, 2016/05/25 20:27:29]

Done.

-                       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,17 @@ 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 SetStyle(DesktopMediaSourceViewStyle* style);
+
   DesktopMediaPickerDialogView* parent_;
   std::unique_ptr<DesktopMediaList> media_list_;
+
+  DesktopMediaSourceViewStyle single_style_;
+  DesktopMediaSourceViewStyle generic_style_;
+  bool use_single_style_;

[msw, 2016/05/25 17:22:12]

Remove this, just apply the single/generic style regardless...
Or maybe skip the SetStyle call if |single_style_ == generic_style_|?

[qiangchen, 2016/05/25 20:27:29]

Done.

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