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

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

Issue 7589002: Fix a crash in the translate info bar. (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
Index: chrome/browser/translate/translate_infobar_delegate.cc
===================================================================
--- chrome/browser/translate/translate_infobar_delegate.cc (revision 95968)
+++ chrome/browser/translate/translate_infobar_delegate.cc (working copy)
@@ -30,15 +30,14 @@
const std::string& original_language,
const std::string& target_language) {
DCHECK_NE(TRANSLATION_ERROR, type);
+ // These must be validated by our callers.
+ DCHECK(TranslateManager::IsSupportedLanguage(target_language));
// The original language can only be "unknown" for the "translating"
// infobar, which is the case when the user started a translation from the
// context menu.
- DCHECK(type == TRANSLATING ||
- original_language != chrome::kUnknownLanguageCode);
- if ((original_language != chrome::kUnknownLanguageCode &&
- !TranslateManager::IsSupportedLanguage(original_language)) ||
- !TranslateManager::IsSupportedLanguage(target_language))
- return NULL;
+ DCHECK(TranslateManager::IsSupportedLanguage(original_language) ||
+ ((type == TRANSLATING) &&
+ (original_language == chrome::kUnknownLanguageCode)));
TranslateInfoBarDelegate* delegate =
new TranslateInfoBarDelegate(type, TranslateErrors::NONE, tab_contents,
original_language, target_language);
« no previous file with comments | « chrome/browser/translate/translate_infobar_delegate.h ('k') | chrome/browser/translate/translate_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698