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

Unified Diff: chrome/browser/translate/translate_manager.cc

Issue 7764003: Fix a crash caused by unknown saved language. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
« no previous file with comments | « chrome/browser/translate/translate_infobar_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/translate/translate_manager.cc
===================================================================
--- chrome/browser/translate/translate_manager.cc (revision 98105)
+++ chrome/browser/translate/translate_manager.cc (working copy)
@@ -489,8 +489,13 @@
if (!tab->browser_context()->IsOffTheRecord() &&
TranslatePrefs::ShouldAutoTranslate(prefs, language_code,
&auto_target_lang)) {
- TranslatePage(tab, language_code, auto_target_lang);
- return;
+ // We need to confirm that the saved target language is still supported.
+ // Also, GetLanguageCode will take care of removing country code if any.
+ auto_target_lang = GetLanguageCode(auto_target_lang);
+ if (IsSupportedLanguage(auto_target_lang)) {
+ TranslatePage(tab, language_code, auto_target_lang);
+ return;
+ }
}
TabContentsWrapper* wrapper =
« no previous file with comments | « chrome/browser/translate/translate_infobar_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698