Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc

Issue 2270543003: Display Window Icon In Picker UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add file Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
index ef1b7644b09028168643bc7f842db7ecd5d84138..74ee8bd8bca90a6bbdcc36474436b0278192deee 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
@@ -7,6 +7,7 @@
#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"
@@ -151,6 +152,8 @@ void DesktopMediaListView::OnSourceAdded(DesktopMediaList* list, int index) {
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)

Powered by Google App Engine
This is Rietveld 408576698