Bug fix: Translate infobar should appear when the user configured so

chrome/browser/translate/translate_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/translate/translate_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
@@ skipping 420 matching lines @@
 
   // Don't translate any Chrome specific page, e.g., New Tab Page, Download,
   // History, and so on.
   GURL page_url = web_contents->GetURL();
   if (!IsTranslatableURL(page_url)) {
     TranslateBrowserMetrics::ReportInitiationStatus(
         TranslateBrowserMetrics::INITIATION_STATUS_URL_IS_NOT_SUPPORTED);
     return;
   }
 
-  // Don't translate similar languages (ex: en-US to en).
   std::string target_lang = GetTargetLanguage(prefs);
   std::string language_code = GetLanguageCode(page_lang);
-  if (language_code == target_lang) {
-    TranslateBrowserMetrics::ReportInitiationStatus(
-        TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES);
-    return;
-  }
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
+  // Don't translate similar languages (ex: en-US to en).
+  // When the flag --enable-translate-settings is on, the locale (|target_lang|)
+  // is not needed to be considered because the user can configure the languages
+  // in the settings UI.
+  if (!command_line->HasSwitch(switches::kEnableTranslateSettings)) {
+    if (language_code == target_lang) {
+      TranslateBrowserMetrics::ReportInitiationStatus(
+          TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES);
+      return;
+    }
+  }
+
   // Don't translate any language the user configured as accepted languages.
   // When the flag --enable-translate-settings is on, the condition is
   // different. In this case, even though a language is an Accept language,
   // it could be translated due to the blacklist.
   if (!command_line->HasSwitch(switches::kEnableTranslateSettings) &&
       accept_languages_->IsAcceptLanguage(original_profile, language_code)) {
     TranslateBrowserMetrics::ReportInitiationStatus(
         TranslateBrowserMetrics::INITIATION_STATUS_ACCEPT_LANGUAGES);
     return;
   }
@@ skipping 336 matching lines @@
   // reason so we are more aggressive showing the shortcuts for never translate.
   #if defined(OS_ANDROID)
   config.never_translate_min_count = 1;
   #else
   config.never_translate_min_count = 3;
   #endif  // defined(OS_ANDROID)
 
   config.always_translate_min_count = 3;
   return config;
 }