Change the text of 'Always translate ...' and modify the layout

chrome/browser/ui/views/translate/translate_bubble_view.cc

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 c777ad36a7e18cd42bce1c96f1b8193f3fcc6253..607772361b7e088e6c9a0b5870070d17e23e39e7 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
@@ -678,7 +678,6 @@ views::View* TranslateBubbleView::CreateViewAdvanced() {
 
   enum {
     COLUMN_SET_ID_LANGUAGES,
-    COLUMN_SET_ID_ALWAYS_TRANSLATE,
     COLUMN_SET_ID_BUTTONS,
   };
 
@@ -690,13 +689,6 @@ views::View* TranslateBubbleView::CreateViewAdvanced() {
                 0, GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(1, 0);
 
-  if (!is_in_incognito_window_) {
-    cs = layout->AddColumnSet(COLUMN_SET_ID_ALWAYS_TRANSLATE);
-    cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER,
-                  0, GridLayout::USE_PREF, 0, 0);
-    cs->AddPaddingColumn(1, 0);
-  }
-
   cs = layout->AddColumnSet(COLUMN_SET_ID_BUTTONS);
   cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER,
                 0, GridLayout::USE_PREF, 0, 0);
@@ -718,9 +710,9 @@ views::View* TranslateBubbleView::CreateViewAdvanced() {
   layout->AddView(target_language_combobox_);
 
   if (!is_in_incognito_window_) {
-    layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
-
-    layout->StartRow(0, COLUMN_SET_ID_ALWAYS_TRANSLATE);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    layout->StartRow(0, COLUMN_SET_ID_LANGUAGES);
+    layout->SkipColumns(1);
     layout->AddView(always_translate_checkbox_);
   }
 
@@ -762,13 +754,10 @@ void TranslateBubbleView::UpdateAdvancedView() {
   string16 target_language_name =
       model_->GetLanguageNameAt(model_->GetTargetLanguageIndex());
 
-  string16 message =
-      l10n_util::GetStringFUTF16(IDS_TRANSLATE_BUBBLE_ALWAYS,
-                                 source_language_name,
-                                 target_language_name);
   // "Always translate" checkbox doesn't exist in an incognito window.
   if (always_translate_checkbox_) {
-    always_translate_checkbox_->SetText(message);
+    always_translate_checkbox_->SetText(
+        l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ALWAYS));
     always_translate_checkbox_->SetChecked(
         model_->ShouldAlwaysTranslate());
   }