Display Window Icon In Picker UI

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

Index: chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h b/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h
index 9a3560c9193c7280fb35b700be599ceec4d0fabe..a39a373de695f126d4cef65e75532b640e5d1379 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h
@@ -21,22 +21,33 @@ struct DesktopMediaSourceViewStyle {
   DesktopMediaSourceViewStyle(const DesktopMediaSourceViewStyle& style);
   DesktopMediaSourceViewStyle(int columns,
                               const gfx::Size& item_size,
+                              const gfx::Rect& icon_rect,
                               const gfx::Rect& label_rect,
                               gfx::HorizontalAlignment text_alignment,
                               const gfx::Rect& image_rect,
                               int selection_border_thickness,
                               int focus_rectangle_inset);
 
+  // This parameter controls how many source items can be displayed in a row.
+  // Source items are instances of DesktopMediaSourceView.
   int columns;
 
+  // The size of a single source item.
   gfx::Size item_size;
 
+  // The relative position to display icon, label and preview image in the
+  // source item.
+  gfx::Rect icon_rect;
   gfx::Rect label_rect;
   gfx::HorizontalAlignment text_alignment;
-
   gfx::Rect image_rect;
+
+  // When a source item is selected, we paint the border to show it. This
+  // parameter controls how thick the border would be.
   int selection_border_thickness;
 
+  // When a source item is focused, we paint dotted line. This parameter
+  // controls the distance between dotted line and the source view boundary.
   int focus_rectangle_inset;
 };
 
@@ -55,6 +66,7 @@ class DesktopMediaSourceView : public views::View {
   // Updates thumbnail and title from |source|.
   void SetName(const base::string16& name);
   void SetThumbnail(const gfx::ImageSkia& thumbnail);
+  void SetIcon(const gfx::ImageSkia& icon);
 
   // Id for the source shown by this View.
   const content::DesktopMediaID& source_id() const { return source_id_; }
@@ -89,6 +101,7 @@ class DesktopMediaSourceView : public views::View {
   content::DesktopMediaID source_id_;
 
   DesktopMediaSourceViewStyle style_;
+  views::ImageView* icon_view_;
   views::ImageView* image_view_;
   views::Label* label_;