Display Window Icon In Picker UI

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

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_SOURCE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_SOURCE_VIEW_H_
 
 #include "content/public/browser/desktop_media_id.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/view.h"
 
 namespace views {
 class ImageView;
 class Label;
 }  // namespace views
 
 class DesktopMediaListView;
 
 // Controls the appearance of DesktopMediaSourceView.
 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);
 
   int columns;

[sky, 2016/08/25 15:44:51]

These might mean something to you, but as someone new to the code they mean
nothing to me. Please add descriptions.

[qiangchen, 2016/08/25 17:07:59]

Done.

 
   gfx::Size item_size;
 
+  gfx::Rect icon_rect;
   gfx::Rect label_rect;
   gfx::HorizontalAlignment text_alignment;
 
   gfx::Rect image_rect;
   int selection_border_thickness;
 
   int focus_rectangle_inset;
 };
 
 // View used for each item in DesktopMediaListView. Shows a single desktop media
 // source as a thumbnail with the title under it.
 class DesktopMediaSourceView : public views::View {
  public:
   DesktopMediaSourceView(DesktopMediaListView* parent,
                          content::DesktopMediaID source_id,
                          DesktopMediaSourceViewStyle style);
   ~DesktopMediaSourceView() override;
 
   // Used to update the style when the number of available items changes.
   void SetStyle(DesktopMediaSourceViewStyle style);
 
   // 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_; }
 
   // Returns true if the source is selected.
   bool is_selected() const { return selected_; }
 
   // views::View interface.
   const char* GetClassName() const override;
   views::View* GetSelectedViewForGroup(int group) override;
@@ skipping 14 matching lines @@
   // (if any).
   void SetSelected(bool selected);
 
   // Updates hover state of the element, and the appearance.
   void SetHovered(bool hovered);
 
   DesktopMediaListView* parent_;
   content::DesktopMediaID source_id_;
 
   DesktopMediaSourceViewStyle style_;
+  views::ImageView* icon_view_;
   views::ImageView* image_view_;
   views::Label* label_;
 
   bool selected_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaSourceView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DESKTOP_CAPTURE_DESKTOP_MEDIA_SOURCE_VIEW_H_