summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/ui/webui/translate_internals
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-12-10 16:19:40 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-12-10 16:01:50 +0000
commit51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch)
tree835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/chrome/browser/ui/webui/translate_internals
parent6036726eb981b6c4b42047513b9d3f4ac865daac (diff)
downloadqtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui/webui/translate_internals')
-rw-r--r--chromium/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc3
-rw-r--r--chromium/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc3
2 files changed, 3 insertions, 3 deletions
diff --git a/chromium/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc b/chromium/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
index 220af586aef..2812147d559 100644
--- a/chromium/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
+++ b/chromium/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
@@ -217,7 +217,8 @@ void TranslateInternalsHandler::SendPrefsToJs() {
prefs::kOfferTranslateEnabled,
translate::TranslatePrefs::kPrefTranslateRecentTarget,
translate::TranslatePrefs::kPrefTranslateBlockedLanguages,
- translate::TranslatePrefs::kPrefTranslateSiteBlacklist,
+ translate::TranslatePrefs::kPrefTranslateSiteBlacklistDeprecated,
+ translate::TranslatePrefs::kPrefTranslateSiteBlacklistWithTime,
translate::TranslatePrefs::kPrefTranslateWhitelists,
translate::TranslatePrefs::kPrefTranslateDeniedCount,
translate::TranslatePrefs::kPrefTranslateIgnoredCount,
diff --git a/chromium/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc b/chromium/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc
index 1613e415212..7bacde2c268 100644
--- a/chromium/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc
+++ b/chromium/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc
@@ -32,8 +32,7 @@ void GetLanguages(base::DictionaryValue* dict) {
std::vector<std::string> language_codes;
l10n_util::GetAcceptLanguagesForLocale(app_locale, &language_codes);
- for (std::vector<std::string>::iterator it = language_codes.begin();
- it != language_codes.end(); ++it) {
+ for (auto it = language_codes.begin(); it != language_codes.end(); ++it) {
const std::string& lang_code = *it;
base::string16 lang_name =
l10n_util::GetDisplayNameForLocale(lang_code, app_locale, false);