Index: components/translate/core/browser/translate_manager.cc |
diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc |
index 82158163eae66cb170d99b14af2fe02b35ad31b2..75cbc56c886d600ce8c72de3d15418f2014284a2 100644 |
--- a/components/translate/core/browser/translate_manager.cc |
+++ b/components/translate/core/browser/translate_manager.cc |
@@ -124,7 +124,8 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) { |
// 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); |
@@ -155,8 +156,7 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) { |
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; |
@@ -360,7 +360,8 @@ std::string TranslateManager::GetTargetLanguage( |
// 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; |