diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 21:56:24 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 21:56:24 +0000 |
| commit | c15a73c90c9e8c9c39faefc455378649c9c415e7 (patch) | |
| tree | 47aa4ce6f168e9682a80a63cef9fafa8a1a0d0b5 /chrome/browser/translate | |
| parent | 72bceace66b3900860b9128f8d8767d80ddc7e16 (diff) | |
| download | chromium_src-c15a73c90c9e8c9c39faefc455378649c9c415e7.zip chromium_src-c15a73c90c9e8c9c39faefc455378649c9c415e7.tar.gz chromium_src-c15a73c90c9e8c9c39faefc455378649c9c415e7.tar.bz2 | |
In the translate infobars (the before and after ones), it was possible to select the original language to be the same as the target one. That would cause a DCHECK when the translation happens (in TranslateManager).
We now prevent from selecting in the original combo the same language as the target language.
BUG=46727
TEST=Open a page in a language which is not the UI one (ex: www.google.de).
You should not be able to select English as a language in the language
menu in the translate infobar.
Review URL: http://codereview.chromium.org/2847016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
| -rw-r--r-- | chrome/browser/translate/languages_menu_model2.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/translate/languages_menu_model2.cc b/chrome/browser/translate/languages_menu_model2.cc index 453c27d..f1144828 100644 --- a/chrome/browser/translate/languages_menu_model2.cc +++ b/chrome/browser/translate/languages_menu_model2.cc @@ -29,7 +29,7 @@ bool LanguagesMenuModel2::IsCommandIdChecked(int command_id) const { bool LanguagesMenuModel2::IsCommandIdEnabled(int command_id) const { // Prevent from having the same language selectable in original and target. if (language_type_ == ORIGINAL) - return true; + return command_id != translate_infobar_delegate_->target_language_index(); return command_id != translate_infobar_delegate_->original_language_index(); } |