| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/translate/chrome_translate_client.h" | 5 #include "chrome/browser/translate/chrome_translate_client.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 std::string auto_translate_language = | 145 std::string auto_translate_language = |
| 146 translate::TranslateManager::GetAutoTargetLanguage( | 146 translate::TranslateManager::GetAutoTargetLanguage( |
| 147 *source, translate_prefs.get()); | 147 *source, translate_prefs.get()); |
| 148 if (!auto_translate_language.empty()) { | 148 if (!auto_translate_language.empty()) { |
| 149 *target = auto_translate_language; | 149 *target = auto_translate_language; |
| 150 return; | 150 return; |
| 151 } | 151 } |
| 152 } | 152 } |
| 153 | 153 |
| 154 std::string accept_languages_str = prefs->GetString(prefs::kAcceptLanguages); | 154 std::string accept_languages_str = prefs->GetString(prefs::kAcceptLanguages); |
| 155 std::vector<std::string> accept_languages_list; | 155 std::vector<std::string> accept_languages_list = base::SplitString( |
| 156 base::SplitString(accept_languages_str, ',', &accept_languages_list); | 156 accept_languages_str, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
| 157 *target = | 157 *target = |
| 158 translate::TranslateManager::GetTargetLanguage(accept_languages_list); | 158 translate::TranslateManager::GetTargetLanguage(accept_languages_list); |
| 159 } | 159 } |
| 160 | 160 |
| 161 translate::TranslateManager* ChromeTranslateClient::GetTranslateManager() { | 161 translate::TranslateManager* ChromeTranslateClient::GetTranslateManager() { |
| 162 return translate_manager_.get(); | 162 return translate_manager_.get(); |
| 163 } | 163 } |
| 164 | 164 |
| 165 void ChromeTranslateClient::ShowTranslateUI( | 165 void ChromeTranslateClient::ShowTranslateUI( |
| 166 translate::TranslateStep step, | 166 translate::TranslateStep step, |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 if (GetLanguageState().InTranslateNavigation()) | 328 if (GetLanguageState().InTranslateNavigation()) |
| 329 return; | 329 return; |
| 330 } | 330 } |
| 331 | 331 |
| 332 TranslateBubbleFactory::Show( | 332 TranslateBubbleFactory::Show( |
| 333 browser->window(), web_contents(), step, error_type); | 333 browser->window(), web_contents(), step, error_type); |
| 334 #else | 334 #else |
| 335 NOTREACHED(); | 335 NOTREACHED(); |
| 336 #endif | 336 #endif |
| 337 } | 337 } |
| OLD | NEW |