| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 if (!web_contents->GetBrowserContext()->IsOffTheRecord()) { | 144 if (!web_contents->GetBrowserContext()->IsOffTheRecord()) { |
| 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); | |
| 155 std::vector<std::string> accept_languages_list = base::SplitString( | |
| 156 accept_languages_str, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); | |
| 157 *target = | 154 *target = |
| 158 translate::TranslateManager::GetTargetLanguage(accept_languages_list); | 155 translate::TranslateManager::GetTargetLanguage(translate_prefs.get()); |
| 159 } | 156 } |
| 160 | 157 |
| 161 translate::TranslateManager* ChromeTranslateClient::GetTranslateManager() { | 158 translate::TranslateManager* ChromeTranslateClient::GetTranslateManager() { |
| 162 return translate_manager_.get(); | 159 return translate_manager_.get(); |
| 163 } | 160 } |
| 164 | 161 |
| 165 void ChromeTranslateClient::ShowTranslateUI( | 162 void ChromeTranslateClient::ShowTranslateUI( |
| 166 translate::TranslateStep step, | 163 translate::TranslateStep step, |
| 167 const std::string& source_language, | 164 const std::string& source_language, |
| 168 const std::string& target_language, | 165 const std::string& target_language, |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 if (GetLanguageState().InTranslateNavigation()) | 332 if (GetLanguageState().InTranslateNavigation()) |
| 336 return; | 333 return; |
| 337 } | 334 } |
| 338 | 335 |
| 339 TranslateBubbleFactory::Show( | 336 TranslateBubbleFactory::Show( |
| 340 browser->window(), web_contents(), step, error_type); | 337 browser->window(), web_contents(), step, error_type); |
| 341 #else | 338 #else |
| 342 NOTREACHED(); | 339 NOTREACHED(); |
| 343 #endif | 340 #endif |
| 344 } | 341 } |
| OLD | NEW |