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

Unified Diff: chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h

Issue 2270543003: Display Window Icon In Picker UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: App vs Browser 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_source_view.h
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h b/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h
index 9a3560c9193c7280fb35b700be599ceec4d0fabe..9a8f4924a2ada361b69dcd7ba174ea116cccee2e 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h
@@ -21,6 +21,7 @@ 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,
@@ -31,6 +32,7 @@ struct DesktopMediaSourceViewStyle {
gfx::Size item_size;
+ gfx::Rect icon_rect;
gfx::Rect label_rect;
gfx::HorizontalAlignment text_alignment;
@@ -55,6 +57,7 @@ class DesktopMediaSourceView : public views::View {
// 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_; }
@@ -89,6 +92,7 @@ class DesktopMediaSourceView : public views::View {
content::DesktopMediaID source_id_;
DesktopMediaSourceViewStyle style_;
+ views::ImageView* icon_view_;
views::ImageView* image_view_;
views::Label* label_;

Powered by Google App Engine
This is Rietveld 408576698