Componentize TranslateUIDelegate

components/translate/core/browser/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 "components/translate/core/browser/translate_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 106 matching lines @@
   // History, and so on.
   const GURL& page_url = translate_driver_->GetVisibleURL();
   if (!translate_client_->IsTranslatableURL(page_url)) {
     TranslateBrowserMetrics::ReportInitiationStatus(
         TranslateBrowserMetrics::INITIATION_STATUS_URL_IS_NOT_SUPPORTED);
     return;
   }
 
   // Get the accepted languages list.
   std::vector<std::string> accept_languages_list;
-  base::SplitString(prefs->GetString(accept_languages_pref_name_.c_str()), ',',
+  base::SplitString(prefs->GetString(accept_languages_pref_name_.c_str()),
+                    ',',

[droger, 2014/04/09 08:31:24]

Why the changes to this file?

[blundell, 2014/04/09 08:49:27]

Reverted.

On 2014/04/09 08:31:24, droger wrote:

                     &accept_languages_list);
 
   std::string target_lang = GetTargetLanguage(accept_languages_list);
   std::string language_code =
       TranslateDownloadManager::GetLanguageCode(page_lang);
 
   // Don't translate similar languages (ex: en-US to en).
   if (language_code == target_lang) {
     TranslateBrowserMetrics::ReportInitiationStatus(
         TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES);
@@ skipping 10 matching lines @@
         language_code);
     return;
   }
 
   scoped_ptr<TranslatePrefs> translate_prefs(
       translate_client_->GetTranslatePrefs());
 
   TranslateAcceptLanguages* accept_languages =
       translate_client_->GetTranslateAcceptLanguages();
   // Don't translate any user black-listed languages.
-  if (!translate_prefs->CanTranslateLanguage(accept_languages,
-                                             language_code)) {
+  if (!translate_prefs->CanTranslateLanguage(accept_languages, language_code)) {
     TranslateBrowserMetrics::ReportInitiationStatus(
         TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_CONFIG);
     return;
   }
 
   // Don't translate any user black-listed URLs.
   if (translate_prefs->IsSiteBlacklisted(page_url.HostNoBrackets())) {
     TranslateBrowserMetrics::ReportInitiationStatus(
         TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_CONFIG);
     return;
@@ skipping 183 matching lines @@
       TranslateDownloadManager::GetLanguageCode(
           TranslateDownloadManager::GetInstance()->application_locale()));
 
   if (TranslateDownloadManager::IsSupportedLanguage(ui_lang))
     return ui_lang;
 
   // Will translate to the first supported language on the Accepted Language
   // list or not at all if no such candidate exists
   std::vector<std::string>::const_iterator iter;
   for (iter = accept_languages_list.begin();
-       iter != accept_languages_list.end(); ++iter) {
+       iter != accept_languages_list.end();
+       ++iter) {
     std::string lang_code = TranslateDownloadManager::GetLanguageCode(*iter);
     if (TranslateDownloadManager::IsSupportedLanguage(lang_code))
       return lang_code;
   }
   return std::string();
 }
 
 // static
 std::string TranslateManager::GetAutoTargetLanguage(
     const std::string& original_language,
     TranslatePrefs* translate_prefs) {
   std::string auto_target_lang;
   if (translate_prefs->ShouldAutoTranslate(original_language,
                                            &auto_target_lang)) {
     // 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 =
         TranslateDownloadManager::GetLanguageCode(auto_target_lang);
     if (TranslateDownloadManager::IsSupportedLanguage(auto_target_lang))
       return auto_target_lang;
   }
   return std::string();
 }