diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-19 17:53:04 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-19 17:53:04 +0000 |
| commit | d816b3411c88780c1f63022ab76f7e78d109c4f2 (patch) | |
| tree | feff56e90dc5cbd5fcd1754d8270e38d77c60603 | |
| parent | 38e877d7523268fcd04b39599ff86100e8214083 (diff) | |
| download | chromium_src-d816b3411c88780c1f63022ab76f7e78d109c4f2.zip chromium_src-d816b3411c88780c1f63022ab76f7e78d109c4f2.tar.gz chromium_src-d816b3411c88780c1f63022ab76f7e78d109c4f2.tar.bz2 | |
Merge 218209 "Use fill setting on the multi-line sub-heading in ..."
> Use fill setting on the multi-line sub-heading in the media galleries dialog (views).
>
> R=msw@chromium.org
> BUG=273857
>
> Review URL: https://chromiumcodereview.appspot.com/22935011
TBR=gbillock@chromium.org
Review URL: https://codereview.chromium.org/23329003
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@218290 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc index bb7eb12..6d876f0 100644 --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc @@ -128,7 +128,10 @@ void MediaGalleriesDialogViews::InitChildViews() { subtext->SetMultiLine(true); subtext->SetHorizontalAlignment(gfx::ALIGN_LEFT); layout->StartRow(0, column_set_id); - layout->AddView(subtext); + layout->AddView( + subtext, 1, 1, + views::GridLayout::FILL, views::GridLayout::LEADING, + dialog_content_width, subtext->GetHeightForWidth(dialog_content_width)); layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); // Scrollable area for checkboxes. |