Display Window Icon In Picker UI

chrome/browser/ui/views/desktop_capture/desktop_media_list_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_list_view.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/desktop_media_list.h"
+#include "chrome/browser/media/window_icon_util.h"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/views/focus/focus_manager.h"
 
 using content::DesktopMediaID;
 
 namespace {
@@ skipping 124 matching lines @@
 
   // We are going to have a second item, apply the generic style.
   if (child_count() == 1)
     SetStyle(&generic_style_);
 
   DesktopMediaSourceView* source_view =
       new DesktopMediaSourceView(this, source.id, *active_style_);
 
   source_view->SetName(source.name);
   source_view->SetGroup(kDesktopMediaSourceViewGroupId);
+  if (source.id.type == DesktopMediaID::TYPE_WINDOW)
+    source_view->SetIcon(GetWindowIcon(source.id));
   AddChildViewAt(source_view, index);
 
   if ((child_count() - 1) % active_style_->columns == 0)
     parent_->OnMediaListRowsChanged();
 
   // Auto select the first screen.
   if (index == 0 && source.id.type == DesktopMediaID::TYPE_SCREEN)
     source_view->RequestFocus();
 
   PreferredSizeChanged();
@@ skipping 76 matching lines @@
     DesktopMediaSourceView* source_view =
         static_cast<DesktopMediaSourceView*>(child_at(i));
     source_view->SetStyle(*active_style_);
   }
 }
 
 void DesktopMediaListView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_GROUP;
   state->name = accessible_name_;
 }