Simplify the translate infobar code some.

chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
@@ skipping 40 matching lines @@
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
   button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_TRANSLATE_INFOBAR_DENY).c_str());
   Signals()->Connect(button, "clicked",
                      G_CALLBACK(&OnDenyPressedThunk), this);
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
   TranslateInfoBarDelegate* delegate = GetDelegate();
   if (delegate->ShouldShowNeverTranslateButton()) {
-    std::string label =
-        l10n_util::GetStringFUTF8(IDS_TRANSLATE_INFOBAR_NEVER_TRANSLATE,
-                                  delegate->GetLanguageDisplayableNameAt(
-                                      delegate->original_language_index()));
+    std::string label = l10n_util::GetStringFUTF8(
+        IDS_TRANSLATE_INFOBAR_NEVER_TRANSLATE,
+        delegate->language_name_at(delegate->original_language_index()));
     button = gtk_button_new_with_label(label.c_str());
     Signals()->Connect(button, "clicked",
                        G_CALLBACK(&OnNeverTranslatePressedThunk), this);
     gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   }
 
   if (delegate->ShouldShowAlwaysTranslateButton()) {
-    std::string label =
-        l10n_util::GetStringFUTF8(IDS_TRANSLATE_INFOBAR_ALWAYS_TRANSLATE,
-                                  delegate->GetLanguageDisplayableNameAt(
-                                      delegate->original_language_index()));
+    std::string label = l10n_util::GetStringFUTF8(
+        IDS_TRANSLATE_INFOBAR_ALWAYS_TRANSLATE,
+        delegate->language_name_at(delegate->original_language_index()));
     button = gtk_button_new_with_label(label.c_str());
     Signals()->Connect(button, "clicked",
                        G_CALLBACK(&OnAlwaysTranslatePressedThunk), this);
     gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
   }
 }
 
 bool BeforeTranslateInfoBar::ShowOptionsMenuButton() const {
   return true;
 }
 
 void BeforeTranslateInfoBar::OnLanguageModified(GtkWidget* sender) {
-  size_t index = GetLanguageComboboxActiveId(GTK_COMBO_BOX(sender));
-  if (index == GetDelegate()->original_language_index())
-    return;
-
-  GetDelegate()->SetOriginalLanguage(index);
+  GetDelegate()->set_original_language_index(
+      GetLanguageComboboxActiveId(GTK_COMBO_BOX(sender)));
 }
 
 void BeforeTranslateInfoBar::OnAcceptPressed(GtkWidget* sender) {
   GetDelegate()->Translate();
 }
 
 void BeforeTranslateInfoBar::OnDenyPressed(GtkWidget* sender) {
   GetDelegate()->TranslationDeclined();
   RemoveSelf();
 }
 
 void BeforeTranslateInfoBar::OnNeverTranslatePressed(GtkWidget* sender) {
   GetDelegate()->NeverTranslatePageLanguage();
 }
 
 void BeforeTranslateInfoBar::OnAlwaysTranslatePressed(GtkWidget* sender) {
   GetDelegate()->AlwaysTranslatePageLanguage();
 }