Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Unified Diff: chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc

Issue 10952016: Simplify the translate infobar code some. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc (revision 157463)
+++ chrome/browser/ui/gtk/infobars/before_translate_infobar_gtk.cc (working copy)
@@ -58,10 +58,9 @@
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);
@@ -69,10 +68,9 @@
}
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);
@@ -85,11 +83,8 @@
}
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) {

Powered by Google App Engine
This is Rietveld 408576698