Index: chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc |
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 19ad08d2fd1a7cbf24481e02cdb273b31fa890df..bab25f882fae44d81def2037f4c1032ec3708cd8 100644 |
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc |
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc |
@@ -27,7 +27,6 @@ |
#include "ui/views/controls/separator.h" |
#include "ui/views/layout/box_layout.h" |
#include "ui/views/layout/grid_layout.h" |
-#include "ui/views/layout/layout_constants.h" |
#include "ui/views/view.h" |
#include "ui/views/widget/widget.h" |
#include "ui/views/window/dialog_client_view.h" |
@@ -112,6 +111,9 @@ void MediaGalleriesDialogViews::InitChildViews() { |
0); |
// Message text. |
+ LayoutDelegate* layout_delegate = LayoutDelegate::Get(); |
+ const int related_control_vert_spacing = layout_delegate->GetMetric( |
tapted
2017/03/20 03:41:52
vertical_padding?
Patti Lor
2017/03/21 06:24:30
Done.
|
+ LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING); |
views::Label* subtext = new views::Label(controller_->GetSubtext()); |
subtext->SetMultiLine(true); |
subtext->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
@@ -120,16 +122,14 @@ void MediaGalleriesDialogViews::InitChildViews() { |
subtext, 1, 1, |
views::GridLayout::FILL, views::GridLayout::LEADING, |
dialog_content_width, subtext->GetHeightForWidth(dialog_content_width)); |
- layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
+ layout->AddPaddingRow(0, related_control_vert_spacing); |
// Scrollable area for checkboxes. |
ScrollableView* scroll_container = new ScrollableView(); |
scroll_container->SetLayoutManager(new views::BoxLayout( |
- views::BoxLayout::kVertical, 0, 0, |
- views::kRelatedControlSmallVerticalSpacing)); |
- scroll_container->SetBorder( |
- views::CreateEmptyBorder(views::kRelatedControlVerticalSpacing, 0, |
- views::kRelatedControlVerticalSpacing, 0)); |
+ views::BoxLayout::kVertical, 0, 0, related_control_vert_spacing)); |
+ scroll_container->SetBorder(views::CreateEmptyBorder( |
+ related_control_vert_spacing, 0, related_control_vert_spacing, 0)); |
std::vector<base::string16> section_headers = |
controller_->GetSectionHeaders(); |
@@ -146,19 +146,18 @@ void MediaGalleriesDialogViews::InitChildViews() { |
header->SetMultiLine(true); |
header->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
header->SetBorder(views::CreateEmptyBorder( |
- views::kRelatedControlVerticalSpacing, |
- LayoutDelegate::Get()->GetMetric( |
+ related_control_vert_spacing, |
+ layout_delegate->GetMetric( |
LayoutDelegate::Metric::PANEL_CONTENT_MARGIN), |
- views::kRelatedControlVerticalSpacing, 0)); |
+ related_control_vert_spacing, 0)); |
scroll_container->AddChildView(header); |
} |
// Checkboxes. |
MediaGalleriesDialogController::Entries::const_iterator iter; |
for (iter = entries.begin(); iter != entries.end(); ++iter) { |
- int spacing = 0; |
- if (iter + 1 == entries.end()) |
- spacing = views::kRelatedControlSmallVerticalSpacing; |
+ int spacing = |
+ iter + 1 == entries.end() ? related_control_vert_spacing : 0; |
AddOrUpdateGallery(*iter, scroll_container, spacing); |
} |
} |
@@ -170,8 +169,8 @@ void MediaGalleriesDialogViews::InitChildViews() { |
views::ScrollView* scroll_view = |
views::ScrollView::CreateScrollViewWithBorder(); |
scroll_view->SetContents(scroll_container); |
- layout->StartRowWithPadding(1, column_set_id, |
- 0, views::kRelatedControlVerticalSpacing); |
+ layout->StartRowWithPadding(1, column_set_id, 0, |
+ related_control_vert_spacing); |
layout->AddView(scroll_view, 1, 1, |
views::GridLayout::FILL, views::GridLayout::FILL, |
dialog_content_width, kScrollAreaHeight); |