diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 09:38:43 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 09:38:43 +0000 |
| commit | a2ec1c5ab77e17e3022d651630fe59e24ae71f4c (patch) | |
| tree | a638e50b00f60546c97ae1acc18dd17f0d698a4d /chrome/browser/gtk | |
| parent | 621f5c6a910d919e9980a7adf4ed478985eb4e84 (diff) | |
| download | chromium_src-a2ec1c5ab77e17e3022d651630fe59e24ae71f4c.zip chromium_src-a2ec1c5ab77e17e3022d651630fe59e24ae71f4c.tar.gz chromium_src-a2ec1c5ab77e17e3022d651630fe59e24ae71f4c.tar.bz2 | |
Reland translate toolbar unit tests (originally landed as r41274, rolled back at r41284).
BUG=None
TEST=New unit tests, tree should stay green after this checkin.
Review URL: http://codereview.chromium.org/938001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/translate_infobars.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/gtk/translate_infobars.cc b/chrome/browser/gtk/translate_infobars.cc index 5f85985..4cffe6c0 100644 --- a/chrome/browser/gtk/translate_infobars.cc +++ b/chrome/browser/gtk/translate_infobars.cc @@ -35,13 +35,13 @@ void ReorderWidgetsTo(GtkWidget* box, GtkWidget** widgets) { // Creates a combobox set up to display text from a list of language codes // (translating the codes into the display string). GtkWidget* BuildLanguageComboboxFrom( + TranslateInfoBarDelegate* delegate, const std::vector<std::string>& languages) { GtkListStore* model = gtk_list_store_new(1, G_TYPE_STRING); for (std::vector<std::string>::const_iterator iter = languages.begin(); iter != languages.end(); ++iter) { GtkTreeIter tree_iter; - std::string name = UTF16ToUTF8( - TranslateInfoBarDelegate::GetDisplayNameForLocale(*iter)); + std::string name = UTF16ToUTF8(delegate->GetDisplayNameForLocale(*iter)); gtk_list_store_append(model, &tree_iter); gtk_list_store_set(model, &tree_iter, 0, name.c_str(), -1); } @@ -202,7 +202,8 @@ void TranslateInfoBar::BuildWidgets() { std::vector<std::string> orig_languages; GetDelegate()->GetAvailableOriginalLanguages(&orig_languages); - original_language_combobox_ = BuildLanguageComboboxFrom(orig_languages); + original_language_combobox_ = BuildLanguageComboboxFrom(GetDelegate(), + orig_languages); g_signal_connect(original_language_combobox_, "changed", G_CALLBACK(&OnOriginalModifiedThunk), this); original_language_combobox_vbox_ = gtk_util::CenterWidgetInHBox( @@ -210,7 +211,8 @@ void TranslateInfoBar::BuildWidgets() { std::vector<std::string> target_languages; GetDelegate()->GetAvailableTargetLanguages(&target_languages); - target_language_combobox_ = BuildLanguageComboboxFrom(target_languages); + target_language_combobox_ = BuildLanguageComboboxFrom(GetDelegate(), + target_languages); g_signal_connect(target_language_combobox_, "changed", G_CALLBACK(&OnTargetModifiedThunk), this); target_language_combobox_vbox_ = gtk_util::CenterWidgetInHBox( |