Display Window Icon In Picker UI

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

 // 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.
 
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
 
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 
 using content::DesktopMediaID;
 
 DesktopMediaSourceViewStyle::DesktopMediaSourceViewStyle(
     const DesktopMediaSourceViewStyle& style) = default;
 
 DesktopMediaSourceViewStyle::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)
     : columns(columns),
       item_size(item_size),
+      icon_rect(icon_rect),
       label_rect(label_rect),
       text_alignment(text_alignment),
       image_rect(image_rect),
       selection_border_thickness(selection_border_thickness),
       focus_rectangle_inset(focus_rectangle_inset) {}
 
 DesktopMediaSourceView::DesktopMediaSourceView(
     DesktopMediaListView* parent,
     DesktopMediaID source_id,
     DesktopMediaSourceViewStyle style)
     : parent_(parent),
       source_id_(source_id),
       style_(style),
+      icon_view_(new views::ImageView()),
       image_view_(new views::ImageView()),
       label_(new views::Label()),
       selected_(false) {
+  AddChildView(icon_view_);
   AddChildView(image_view_);
   AddChildView(label_);
   image_view_->set_interactive(false);
+  icon_view_->set_interactive(false);

[msw, 2016/08/23 21:37:12]

nit: order before image_view_->set_interactive(false); to match other ordering.

[qiangchen, 2016/08/23 23:24:30]

Done.

   SetFocusBehavior(FocusBehavior::ALWAYS);
   SetStyle(style_);
 }
 
 DesktopMediaSourceView::~DesktopMediaSourceView() {}
 
 const char* DesktopMediaSourceView::kDesktopMediaSourceViewClassName =
     "DesktopMediaPicker_DesktopMediaSourceView";
 
 void DesktopMediaSourceView::SetName(const base::string16& name) {
   label_->SetText(name);
 }
 
 void DesktopMediaSourceView::SetThumbnail(const gfx::ImageSkia& thumbnail) {
   image_view_->SetImage(thumbnail);
 }
 
+void DesktopMediaSourceView::SetIcon(const gfx::ImageSkia& icon) {
+  icon_view_->SetImage(icon);
+}
+
 void DesktopMediaSourceView::SetSelected(bool selected) {
   if (selected == selected_)
     return;
   selected_ = selected;
 
   if (selected) {
     // Unselect all other sources.
     Views neighbours;
     parent()->GetViewsInGroup(GetGroup(), &neighbours);
     for (Views::iterator i(neighbours.begin()); i != neighbours.end(); ++i) {
@@ skipping 41 matching lines @@
 
 void DesktopMediaSourceView::SetStyle(DesktopMediaSourceViewStyle style) {
   style_ = style;
   image_view_->SetBoundsRect(style_.image_rect);
   if (selected_) {
     const SkColor border_color = GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
     image_view_->SetBorder(views::Border::CreateSolidBorder(
         style_.selection_border_thickness, border_color));
   }
+  icon_view_->SetBoundsRect(style_.icon_rect);
+  icon_view_->SetImageSize(gfx::Size(style_.icon_rect.width(),

[msw, 2016/08/23 21:37:12]

nit: icon_view_->SetImageSize(style_.icon_rect.size());

[qiangchen, 2016/08/23 23:24:30]

Done.

+                                     style_.icon_rect.height()));
   label_->SetBoundsRect(style_.label_rect);
   label_->SetHorizontalAlignment(style_.text_alignment);
 }
 
 views::View* DesktopMediaSourceView::GetSelectedViewForGroup(int group) {
   Views neighbours;
   parent()->GetViewsInGroup(group, &neighbours);
   if (neighbours.empty())
     return nullptr;
 
@@ skipping 67 matching lines @@
   if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
     RequestFocus();
     event->SetHandled();
   }
 }
 
 void DesktopMediaSourceView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_BUTTON;
   state->name = label_->text();
 }