chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc - Issue 2270543003: Display Window Icon In Picker UI

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2270543003: Display Window Icon In Picker UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Unittest crash 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

« chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc ('K') | « chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc ('k') | chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h » ('j') | chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

index ce54f078e2304bcd6f230ecbd3a1ba876f1dddb5..05d2e5bcb6424d1c3b72661d11a94d5408701e66 100644

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

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

@@ -83,6 +83,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(

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

@@ -92,6 +93,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(

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

@@ -124,8 +126,9 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(

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(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

@@ -154,6 +157,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(

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