Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(870)

Unified Diff: chrome/browser/net/chrome_http_user_agent_settings.cc

Issue 2559243003: Extend with a language code in http accept languages
Patch Set: Rebased, fixed nits and handed over this CL :( Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/chrome_http_user_agent_settings.cc
diff --git a/chrome/browser/net/chrome_http_user_agent_settings.cc b/chrome/browser/net/chrome_http_user_agent_settings.cc
index 25e3c7da4321e100c0ecf9d5e8cb06ee3b2f55b8..7ac910f2154818f38de6d2a218167fdf20d95eff 100644
--- a/chrome/browser/net/chrome_http_user_agent_settings.cc
+++ b/chrome/browser/net/chrome_http_user_agent_settings.cc
@@ -9,13 +9,14 @@
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
#include "net/http/http_util.h"
+#include "net/http/http_util_icu.h"
ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
pref_accept_language_.Init(prefs::kAcceptLanguages, prefs);
last_pref_accept_language_ = *pref_accept_language_;
- last_http_accept_language_ =
- net::HttpUtil::GenerateAcceptLanguageHeader(last_pref_accept_language_);
+ last_http_accept_language_ = net::http_util_icu::GenerateAcceptLanguageHeader(
+ last_pref_accept_language_);
pref_accept_language_.MoveToThread(
content::BrowserThread::GetTaskRunnerForThread(
content::BrowserThread::IO));
@@ -35,7 +36,8 @@ std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const {
std::string new_pref_accept_language = *pref_accept_language_;
if (new_pref_accept_language != last_pref_accept_language_) {
last_http_accept_language_ =
- net::HttpUtil::GenerateAcceptLanguageHeader(new_pref_accept_language);
+ net::http_util_icu::GenerateAcceptLanguageHeader(
+ new_pref_accept_language);
last_pref_accept_language_ = new_pref_accept_language;
}
return last_http_accept_language_;
@@ -45,4 +47,3 @@ std::string ChromeHttpUserAgentSettings::GetUserAgent() const {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
return ::GetUserAgent();
}
-

Powered by Google App Engine
This is Rietveld 408576698