Display Window Icon In Picker UI

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

 // Copyright 2013 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_picker_views.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 65 matching lines @@
 
   const SkColor bg_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_MenuBackgroundColor);
 
   if (screen_list) {
     source_types_.push_back(DesktopMediaID::TYPE_SCREEN);
 
     const DesktopMediaSourceViewStyle kSingleScreenStyle(
         1,                                       // columns
         gfx::Size(360, 280),                     // item_size
+        gfx::Rect(),                             // icon_rect
         gfx::Rect(),                             // label_rect
         gfx::HorizontalAlignment::ALIGN_CENTER,  // text_alignment
         gfx::Rect(20, 20, 320, 240),             // image_rect
         4,                                       // selection_border_thickness
         5);                                      // focus_rectangle_inset
 
     const DesktopMediaSourceViewStyle kGenericScreenStyle(
         2,                                       // columns
         gfx::Size(270, 220),                     // item_size
+        gfx::Rect(),                             // icon_rect
         gfx::Rect(15, 165, 240, 40),             // label_rect
         gfx::HorizontalAlignment::ALIGN_CENTER,  // text_alignment
         gfx::Rect(15, 15, 240, 150),             // image_rect
         2,                                       // selection_border_thickness
         5);                                      // focus_rectangle_inset
 
     views::ScrollView* screen_scroll_view =
         views::ScrollView::CreateScrollViewWithBorder();
     base::string16 screen_title_text =
         l10n_util::GetStringUTF16(IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_SCREEN);
@@ skipping 10 matching lines @@
         views::Background::CreateSolidBackground(bg_color));
 
     pane_->AddTab(screen_title_text, screen_scroll_view);
     pane_->set_listener(this);
   }
 
   if (window_list) {
     source_types_.push_back(DesktopMediaID::TYPE_WINDOW);
 
     const DesktopMediaSourceViewStyle kWindowStyle(
-        3,                                       // columns
-        gfx::Size(180, 160),                     // item_size
-        gfx::Rect(10, 110, 160, 40),             // label_rect
-        gfx::HorizontalAlignment::ALIGN_CENTER,  // text_alignment
-        gfx::Rect(8, 8, 164, 104),               // image_rect
-        2,                                       // selection_border_thickness
-        5);                                      // focus_rectangle_inset
+        3,                                     // columns
+        gfx::Size(180, 160),                   // item_size
+        gfx::Rect(10, 120, 20, 20),            // icon_rect
+        gfx::Rect(32, 110, 138, 40),           // label_rect
+        gfx::HorizontalAlignment::ALIGN_LEFT,  // text_alignment
+        gfx::Rect(8, 8, 164, 104),             // image_rect
+        2,                                     // selection_border_thickness
+        5);                                    // focus_rectangle_inset
 
     views::ScrollView* window_scroll_view =
         views::ScrollView::CreateScrollViewWithBorder();
     base::string16 window_title_text =
         l10n_util::GetStringUTF16(IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_WINDOW);
     list_views_.push_back(new DesktopMediaListView(this, std::move(window_list),
                                                    kWindowStyle, kWindowStyle,
                                                    window_title_text));
     window_scroll_view->SetContents(list_views_.back());
     window_scroll_view->ClipHeightTo(kWindowStyle.item_size.height(),
                                      kWindowStyle.item_size.height() * 2);
     window_scroll_view->set_hide_horizontal_scrollbar(true);
     window_scroll_view->set_background(
         views::Background::CreateSolidBackground(bg_color));
 
     pane_->AddTab(window_title_text, window_scroll_view);
     pane_->set_listener(this);
   }
 
   if (tab_list) {
     source_types_.push_back(DesktopMediaID::TYPE_WEB_CONTENTS);
 
     const DesktopMediaSourceViewStyle kTabStyle(
         1,                                     // columns
         gfx::Size(600, 30),                    // item_size
+        gfx::Rect(),                           // icon_rect
         gfx::Rect(46, 0, 490, 30),             // label_rect
         gfx::HorizontalAlignment::ALIGN_LEFT,  // text_alignment
         gfx::Rect(10, 2, 26, 26),              // image_rect
         1,                                     // selection_border_thickness
         0);                                    // focus_rectangle_inset
 
     views::ScrollView* tab_scroll_view =
         views::ScrollView::CreateScrollViewWithBorder();
     base::string16 tab_title_text =
         l10n_util::GetStringUTF16(IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_TAB);
@@ skipping 274 matching lines @@
 
 // static
 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           extensions::switches::kDisableDesktopCapturePickerNewUI)) {
     return std::unique_ptr<DesktopMediaPicker>(
         new deprecated::DesktopMediaPickerViews());
   }
   return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }