Index: chrome/browser/ui/views/translate/translate_bubble_view.cc |
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc |
index 922a840c8a22053e214486d167b6ca3af0cc044e..11e6774f08ac0dd091ae18db2cdb4d23ff268848 100644 |
--- a/chrome/browser/ui/views/translate/translate_bubble_view.cc |
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc |
@@ -22,6 +22,7 @@ |
#include "chrome/browser/ui/chrome_pages.h" |
#include "chrome/browser/ui/translate/translate_bubble_model_impl.h" |
#include "chrome/browser/ui/translate/translate_bubble_view_state_transition.h" |
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/grit/generated_resources.h" |
#include "components/prefs/pref_service.h" |
@@ -48,7 +49,6 @@ |
#include "ui/views/controls/styled_label.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/widget/widget.h" |
namespace { |
@@ -543,15 +543,20 @@ views::View* TranslateBubbleView::CreateViewBeforeTranslate() { |
COLUMN_SET_ID_CONTENT, |
}; |
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); |
+ const int button_spacing = |
+ provider->GetDistanceMetric(views::DISTANCE_RELATED_BUTTON_HORIZONTAL); |
+ |
views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_MESSAGE); |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
if (Use2016Q2UI()) { |
// Add padding between the icon and the text. |
- cs->AddPaddingColumn(0, views::kUnrelatedControlHorizontalSpacing); |
+ cs->AddPaddingColumn( |
+ 0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_HORIZONTAL)); |
} else { |
// Add padding between the text and the link. |
- cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing); |
+ cs->AddPaddingColumn(0, button_spacing); |
} |
cs->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, |
GridLayout::USE_PREF, 0, 0); |
@@ -561,7 +566,7 @@ views::View* TranslateBubbleView::CreateViewBeforeTranslate() { |
cs->AddPaddingColumn(1, 0); |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
- cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing); |
+ cs->AddPaddingColumn(0, button_spacing); |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
@@ -599,7 +604,8 @@ views::View* TranslateBubbleView::CreateViewBeforeTranslate() { |
// In an incognito window, the "Always translate" checkbox shouldn't be shown. |
if (Use2016Q2UI() && !is_in_incognito_window_) { |
- layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
+ layout->AddPaddingRow(0, provider->GetDistanceMetric( |
+ views::DISTANCE_RELATED_CONTROL_VERTICAL)); |
layout->StartRow(0, COLUMN_SET_ID_MESSAGE); |
layout->SkipColumns(1); |
before_always_translate_checkbox_ = new views::Checkbox( |
@@ -609,9 +615,11 @@ views::View* TranslateBubbleView::CreateViewBeforeTranslate() { |
layout->AddView(before_always_translate_checkbox_); |
} |
if (Use2016Q2UI()) { |
- layout->AddPaddingRow(0, views::kPanelSubVerticalSpacing); |
+ layout->AddPaddingRow( |
+ 0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL)); |
} else { |
- layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); |
+ layout->AddPaddingRow( |
+ 0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL)); |
} |
layout->StartRow(0, COLUMN_SET_ID_CONTENT); |
@@ -668,12 +676,14 @@ views::View* TranslateBubbleView::CreateViewTranslating() { |
COLUMN_SET_ID_CONTENT, |
}; |
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); |
views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_MESSAGE); |
if (Use2016Q2UI()) { |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
views::GridLayout::USE_PREF, 0, 0); |
// Add padding between the icon and the text. |
- cs->AddPaddingColumn(0, views::kUnrelatedControlHorizontalSpacing); |
+ cs->AddPaddingColumn( |
+ 0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_HORIZONTAL)); |
} |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
@@ -689,7 +699,8 @@ views::View* TranslateBubbleView::CreateViewTranslating() { |
AddIconToLayout(layout); |
layout->AddView(label); |
- layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); |
+ layout->AddPaddingRow( |
+ 0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL)); |
layout->StartRow(0, COLUMN_SET_ID_CONTENT); |
views::LabelButton* revert_button = |
@@ -717,13 +728,16 @@ views::View* TranslateBubbleView::CreateViewAfterTranslate() { |
COLUMN_SET_ID_CONTENT, |
}; |
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); |
+ |
views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_MESSAGE); |
// TODO(ftang) Restore icon without causing layout defects: crbug.com/610351 |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
- cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing); |
+ cs->AddPaddingColumn(0, provider->GetDistanceMetric( |
+ views::DISTANCE_RELATED_BUTTON_HORIZONTAL)); |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
cs->AddPaddingColumn(1, 0); |
@@ -738,7 +752,8 @@ views::View* TranslateBubbleView::CreateViewAfterTranslate() { |
layout->AddView( |
CreateLink(this, IDS_TRANSLATE_BUBBLE_ADVANCED, LINK_ID_ADVANCED)); |
- layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); |
+ layout->AddPaddingRow( |
+ 0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL)); |
layout->StartRow(0, COLUMN_SET_ID_CONTENT); |
views::LabelButton* button = views::MdTextButton::CreateSecondaryUiButton( |
@@ -764,13 +779,16 @@ views::View* TranslateBubbleView::CreateViewError() { |
COLUMN_SET_ID_CONTENT, |
}; |
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); |
+ |
views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_MESSAGE); |
// TODO(ftang) Restore icon without causing layout defects: crbug.com/610351 |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
- cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing); |
+ cs->AddPaddingColumn(0, provider->GetDistanceMetric( |
+ views::DISTANCE_RELATED_BUTTON_HORIZONTAL)); |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
cs->AddPaddingColumn(1, 0); |
@@ -785,7 +803,8 @@ views::View* TranslateBubbleView::CreateViewError() { |
layout->AddView( |
CreateLink(this, IDS_TRANSLATE_BUBBLE_ADVANCED, LINK_ID_ADVANCED)); |
- layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); |
+ layout->AddPaddingRow( |
+ 0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL)); |
layout->StartRow(0, COLUMN_SET_ID_CONTENT); |
views::LabelButton* button = views::MdTextButton::CreateSecondaryUiButton( |
@@ -841,10 +860,13 @@ views::View* TranslateBubbleView::CreateViewAdvanced() { |
COLUMN_SET_ID_BUTTONS, |
}; |
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); |
+ |
views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_LANGUAGES); |
cs->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
- cs->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); |
+ cs->AddPaddingColumn(0, provider->GetDistanceMetric( |
+ views::DISTANCE_RELATED_CONTROL_HORIZONTAL)); |
cs->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0, GridLayout::USE_PREF, |
0, 0); |
cs->AddPaddingColumn(1, 0); |
@@ -852,10 +874,12 @@ views::View* TranslateBubbleView::CreateViewAdvanced() { |
cs = layout->AddColumnSet(COLUMN_SET_ID_BUTTONS); |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
- cs->AddPaddingColumn(1, views::kUnrelatedControlHorizontalSpacing); |
+ cs->AddPaddingColumn( |
+ 1, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_HORIZONTAL)); |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
- cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing); |
+ cs->AddPaddingColumn(0, provider->GetDistanceMetric( |
+ views::DISTANCE_RELATED_BUTTON_HORIZONTAL)); |
cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
GridLayout::USE_PREF, 0, 0); |
@@ -863,20 +887,23 @@ views::View* TranslateBubbleView::CreateViewAdvanced() { |
layout->AddView(source_language_label); |
layout->AddView(source_language_combobox_); |
- layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
+ const int vertical_spacing = |
+ provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL); |
+ layout->AddPaddingRow(0, vertical_spacing); |
layout->StartRow(0, COLUMN_SET_ID_LANGUAGES); |
layout->AddView(target_language_label); |
layout->AddView(target_language_combobox_); |
if (!is_in_incognito_window_) { |
- layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
+ layout->AddPaddingRow(0, vertical_spacing); |
layout->StartRow(0, COLUMN_SET_ID_LANGUAGES); |
layout->SkipColumns(1); |
layout->AddView(advanced_always_translate_checkbox_); |
} |
- layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing); |
+ layout->AddPaddingRow( |
+ 0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL)); |
layout->StartRow(0, COLUMN_SET_ID_BUTTONS); |
// TODO(estade): this should use CreateExtraView(). |