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

Unified Diff: components/translate/language_detection/language_detection_util.cc

Issue 203043002: Fix "unreachable code" warnings (MSVC warning 4702), misc. edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 9 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: 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) {

Powered by Google App Engine
This is Rietveld 408576698