| 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 6b4dba941d56d103489d88e2e49abdd103dbe5a1..ae7f1dad9d6e51902419cf85126bfaf176459d90 100644
|
| --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| @@ -85,6 +85,8 @@ views::Link* CreateLink(views::LinkListener* listener,
|
| return CreateLink(listener, l10n_util::GetStringUTF16(resource_id), id);
|
| }
|
|
|
| +// TODO(ftang) Restore icons in CreateViewAfterTranslate and CreateViewError
|
| +// without causing layout issues; see http://crbug.com/610351
|
| void AddIconToLayout(views::GridLayout* layout) {
|
| views::ImageView* icon = new views::ImageView();
|
| ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
|
| @@ -703,11 +705,9 @@ views::View* TranslateBubbleView::CreateViewAfterTranslate() {
|
| };
|
|
|
| views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_MESSAGE);
|
| - if (Use2016Q2UI()) {
|
| - cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
|
| - GridLayout::USE_PREF, 0, 0);
|
| - cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
|
| - }
|
| +
|
| + // 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);
|
| @@ -721,8 +721,6 @@ views::View* TranslateBubbleView::CreateViewAfterTranslate() {
|
| GridLayout::USE_PREF, 0, 0);
|
|
|
| layout->StartRow(0, COLUMN_SET_ID_MESSAGE);
|
| - if (Use2016Q2UI())
|
| - AddIconToLayout(layout);
|
| layout->AddView(label);
|
| layout->AddView(
|
| CreateLink(this, IDS_TRANSLATE_BUBBLE_ADVANCED, LINK_ID_ADVANCED));
|
| @@ -753,11 +751,9 @@ views::View* TranslateBubbleView::CreateViewError() {
|
| };
|
|
|
| views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_ID_MESSAGE);
|
| - if (Use2016Q2UI()) {
|
| - cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
|
| - GridLayout::USE_PREF, 0, 0);
|
| - cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
|
| - }
|
| +
|
| + // 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);
|
| @@ -771,8 +767,6 @@ views::View* TranslateBubbleView::CreateViewError() {
|
| GridLayout::USE_PREF, 0, 0);
|
|
|
| layout->StartRow(0, COLUMN_SET_ID_MESSAGE);
|
| - if (Use2016Q2UI())
|
| - AddIconToLayout(layout);
|
| layout->AddView(label);
|
| layout->AddView(
|
| CreateLink(this, IDS_TRANSLATE_BUBBLE_ADVANCED, LINK_ID_ADVANCED));
|
|
|