Index: components/translate/language_detection/language_detection_util.cc |
=================================================================== |
--- components/translate/language_detection/language_detection_util.cc (revision 256983) |
+++ components/translate/language_detection/language_detection_util.cc (working copy) |
@@ -245,29 +245,32 @@ |
translate::ReportLanguageVerification( |
translate::LANGUAGE_VERIFICATION_UNKNOWN); |
return language; |
- } else if (CanCLDComplementSubCode(language, cld_language)) { |
+ } |
+ |
+ if (CanCLDComplementSubCode(language, cld_language)) { |
translate::ReportLanguageVerification( |
translate::LANGUAGE_VERIFICATION_CLD_COMPLEMENT_SUB_CODE); |
return cld_language; |
- } else if (IsSameOrSimilarLanguages(language, cld_language)) { |
+ } |
+ |
+ if (IsSameOrSimilarLanguages(language, cld_language)) { |
translate::ReportLanguageVerification( |
translate::LANGUAGE_VERIFICATION_CLD_AGREE); |
return language; |
- } else if (MaybeServerWrongConfiguration(language, cld_language)) { |
+ } |
+ |
+ if (MaybeServerWrongConfiguration(language, cld_language)) { |
translate::ReportLanguageVerification( |
translate::LANGUAGE_VERIFICATION_TRUST_CLD); |
return cld_language; |
- } else { |
- translate::ReportLanguageVerification( |
- translate::LANGUAGE_VERIFICATION_CLD_DISAGREE); |
- // Content-Language value might be wrong because CLD says that this page |
- // is written in another language with confidence. |
- // In this case, Chrome doesn't rely on any of the language codes, and |
- // gives up suggesting a translation. |
- return std::string(kUnknownLanguageCode); |
} |
- return language; |
+ // Content-Language value might be wrong because CLD says that this page is |
+ // written in another language with confidence. In this case, Chrome doesn't |
+ // rely on any of the language codes, and gives up suggesting a translation. |
+ translate::ReportLanguageVerification( |
+ translate::LANGUAGE_VERIFICATION_CLD_DISAGREE); |
+ return kUnknownLanguageCode; |
} |
void CorrectLanguageCodeTypo(std::string* code) { |