| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/translate_prefs.h" | 5 #include "chrome/browser/translate/translate_prefs.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/prefs/scoped_user_pref_update.h" | 10 #include "base/prefs/scoped_user_pref_update.h" |
| 11 #include "base/strings/string_split.h" | 11 #include "base/strings/string_split.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/translate/translate_accept_languages.h" | 15 #include "chrome/browser/translate/translate_accept_languages.h" |
| 16 #include "chrome/browser/translate/translate_manager.h" | 16 #include "chrome/browser/translate/translate_manager.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "components/translate/core/browser/translate_download_manager.h" |
| 18 #include "components/translate/core/common/translate_util.h" | 19 #include "components/translate/core/common/translate_util.h" |
| 19 #include "components/user_prefs/pref_registry_syncable.h" | 20 #include "components/user_prefs/pref_registry_syncable.h" |
| 20 | 21 |
| 21 const char TranslatePrefs::kPrefTranslateLanguageBlacklist[] = | 22 const char TranslatePrefs::kPrefTranslateLanguageBlacklist[] = |
| 22 "translate_language_blacklist"; | 23 "translate_language_blacklist"; |
| 23 const char TranslatePrefs::kPrefTranslateSiteBlacklist[] = | 24 const char TranslatePrefs::kPrefTranslateSiteBlacklist[] = |
| 24 "translate_site_blacklist"; | 25 "translate_site_blacklist"; |
| 25 const char TranslatePrefs::kPrefTranslateWhitelists[] = | 26 const char TranslatePrefs::kPrefTranslateWhitelists[] = |
| 26 "translate_whitelists"; | 27 "translate_whitelists"; |
| 27 const char TranslatePrefs::kPrefTranslateDeniedCount[] = | 28 const char TranslatePrefs::kPrefTranslateDeniedCount[] = |
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 | 442 |
| 442 std::set<std::string> result; | 443 std::set<std::string> result; |
| 443 | 444 |
| 444 for (std::vector<std::string>::const_iterator it = | 445 for (std::vector<std::string>::const_iterator it = |
| 445 blacklisted_languages.begin(); | 446 blacklisted_languages.begin(); |
| 446 it != blacklisted_languages.end(); ++it) { | 447 it != blacklisted_languages.end(); ++it) { |
| 447 result.insert(*it); | 448 result.insert(*it); |
| 448 } | 449 } |
| 449 | 450 |
| 450 const std::string& app_locale = g_browser_process->GetApplicationLocale(); | 451 const std::string& app_locale = g_browser_process->GetApplicationLocale(); |
| 451 std::string ui_lang = TranslateManager::GetLanguageCode(app_locale); | 452 std::string ui_lang = TranslateDownloadManager::GetLanguageCode(app_locale); |
| 452 bool is_ui_english = ui_lang == "en" || | 453 bool is_ui_english = ui_lang == "en" || |
| 453 StartsWithASCII(ui_lang, "en-", false); | 454 StartsWithASCII(ui_lang, "en-", false); |
| 454 | 455 |
| 455 for (std::vector<std::string>::const_iterator it = accept_languages.begin(); | 456 for (std::vector<std::string>::const_iterator it = accept_languages.begin(); |
| 456 it != accept_languages.end(); ++it) { | 457 it != accept_languages.end(); ++it) { |
| 457 std::string converted_lang = ConvertLangCodeForTranslation(*it); | 458 std::string converted_lang = ConvertLangCodeForTranslation(*it); |
| 458 | 459 |
| 459 // Regarding http://crbug.com/36182, even though English exists in Accept | 460 // Regarding http://crbug.com/36182, even though English exists in Accept |
| 460 // language list, English could be translated on non-English locale. | 461 // language list, English could be translated on non-English locale. |
| 461 if (converted_lang == "en" && !is_ui_english) | 462 if (converted_lang == "en" && !is_ui_english) |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 | 541 |
| 541 bool TranslatePrefs::IsListEmpty(const char* pref_id) const { | 542 bool TranslatePrefs::IsListEmpty(const char* pref_id) const { |
| 542 const base::ListValue* blacklist = prefs_->GetList(pref_id); | 543 const base::ListValue* blacklist = prefs_->GetList(pref_id); |
| 543 return (blacklist == NULL || blacklist->empty()); | 544 return (blacklist == NULL || blacklist->empty()); |
| 544 } | 545 } |
| 545 | 546 |
| 546 bool TranslatePrefs::IsDictionaryEmpty(const char* pref_id) const { | 547 bool TranslatePrefs::IsDictionaryEmpty(const char* pref_id) const { |
| 547 const base::DictionaryValue* dict = prefs_->GetDictionary(pref_id); | 548 const base::DictionaryValue* dict = prefs_->GetDictionary(pref_id); |
| 548 return (dict == NULL || dict->empty()); | 549 return (dict == NULL || dict->empty()); |
| 549 } | 550 } |
| OLD | NEW |