summaryrefslogtreecommitdiffstats
path: root/chrome/browser/translate/translate_accept_languages.cc
diff options
context:
space:
mode:
authorhajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 17:16:51 +0000
committerhajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 17:16:51 +0000
commitc6a3ebeb20fea0e32b3bf2d5e5ce8e83a26bc676 (patch)
tree64ef7acba11493eef8610ed0ee354de80cc1988e /chrome/browser/translate/translate_accept_languages.cc
parent7803b4edaa251259f23d2d0bafd8fcf1df617b7b (diff)
downloadchromium_src-c6a3ebeb20fea0e32b3bf2d5e5ce8e83a26bc676.zip
chromium_src-c6a3ebeb20fea0e32b3bf2d5e5ce8e83a26bc676.tar.gz
chromium_src-c6a3ebeb20fea0e32b3bf2d5e5ce8e83a26bc676.tar.bz2
Translate: Convert synonyms before checking if the language is an Accept language or not
Renamed TranslateUtil::ConvertLanguageCodeSynonym to TranslateUtil::ToTranslateLanguageSynonym to convert an language code for Translate and added TranslateUtil::ToTranslateLanguageSynonym to trans-convert a language synonym. BUG=248814 Review URL: https://chromiumcodereview.appspot.com/16512008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate/translate_accept_languages.cc')
-rw-r--r--chrome/browser/translate/translate_accept_languages.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/translate/translate_accept_languages.cc b/chrome/browser/translate/translate_accept_languages.cc
index b5985b0..4e910ba 100644
--- a/chrome/browser/translate/translate_accept_languages.cc
+++ b/chrome/browser/translate/translate_accept_languages.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/translate/translate_manager.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
+#include "chrome/common/translate/translate_util.h"
#include "content/public/browser/notification_source.h"
#include "net/url_request/url_fetcher.h"
@@ -51,7 +52,9 @@ bool TranslateAcceptLanguages::IsAcceptLanguage(Profile* profile,
iter = accept_languages_.find(pref_service);
}
- return iter->second.count(language) != 0;
+ std::string accept_language = language;
+ TranslateUtil::ToChromeLanguageSynonym(&accept_language);
+ return iter->second.count(accept_language) != 0;
}
void TranslateAcceptLanguages::InitAcceptLanguages(PrefService* prefs) {