diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 12:16:30 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 12:16:30 +0000 |
| commit | 6a6ce8b3a868dd1f94f8731ebd05abd39da46fec (patch) | |
| tree | 1d13b28d170d29bd1ef503ba167eae1500afb705 /chrome/browser/translate/options_menu_model.cc | |
| parent | 4757aecb7691429748791c315b17b7f402869197 (diff) | |
| download | chromium_src-6a6ce8b3a868dd1f94f8731ebd05abd39da46fec.zip chromium_src-6a6ce8b3a868dd1f94f8731ebd05abd39da46fec.tar.gz chromium_src-6a6ce8b3a868dd1f94f8731ebd05abd39da46fec.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.
Revert "Reland translate toolbar unit tests (originally landed as r41274, rolled back at r41284)."
Revert r41569 - 10.6 unit tests not passing.
Review URL: http://codereview.chromium.org/962001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate/options_menu_model.cc')
| -rw-r--r-- | chrome/browser/translate/options_menu_model.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc index 376e2cb..4364e07 100644 --- a/chrome/browser/translate/options_menu_model.cc +++ b/chrome/browser/translate/options_menu_model.cc @@ -13,7 +13,7 @@ OptionsMenuModel::OptionsMenuModel(menus::SimpleMenuModel::Delegate* delegate, TranslateInfoBarDelegate* translate_delegate) : menus::SimpleMenuModel(delegate) { string16 original_language = - TranslateInfoBarDelegate::GetDisplayNameForLocale( + translate_delegate->GetDisplayNameForLocale( translate_delegate->original_lang_code()); TranslateInfoBarDelegate::TranslateState state = translate_delegate->state(); if (state == TranslateInfoBarDelegate::kBeforeTranslate) { @@ -26,7 +26,7 @@ OptionsMenuModel::OptionsMenuModel(menus::SimpleMenuModel::Delegate* delegate, IDS_TRANSLATE_INFOBAR_OPTIONS_NEVER_TRANSLATE_SITE)); } else if (state == TranslateInfoBarDelegate::kAfterTranslate) { string16 target_language = - TranslateInfoBarDelegate::GetDisplayNameForLocale( + translate_delegate->GetDisplayNameForLocale( translate_delegate->target_lang_code()); AddCheckItem(IDC_TRANSLATE_OPTIONS_ALWAYS, l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS_ALWAYS, |