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

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

Issue 12463021: Stop sending Accept-Charset HTTP header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync (r188089) Created 7 years, 9 months 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 a7bdde55c047ec00d3ea39279f65c9b70cb1bcb7..f1e9d1508810530a5f2b2771f6343427dad67884 100644
--- a/chrome/browser/net/chrome_http_user_agent_settings.cc
+++ b/chrome/browser/net/chrome_http_user_agent_settings.cc
@@ -13,19 +13,12 @@
ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
pref_accept_language_.Init(prefs::kAcceptLanguages, prefs);
- pref_accept_charset_.Init(prefs::kDefaultCharset, prefs);
last_pref_accept_language_ = *pref_accept_language_;
last_http_accept_language_ =
net::HttpUtil::GenerateAcceptLanguageHeader(last_pref_accept_language_);
- last_pref_accept_charset_ = *pref_accept_charset_;
- last_http_accept_charset_ =
- net::HttpUtil::GenerateAcceptCharsetHeader(last_pref_accept_charset_);
pref_accept_language_.MoveToThread(
content::BrowserThread::GetMessageLoopProxyForThread(
content::BrowserThread::IO));
- pref_accept_charset_.MoveToThread(
- content::BrowserThread::GetMessageLoopProxyForThread(
- content::BrowserThread::IO));
}
ChromeHttpUserAgentSettings::~ChromeHttpUserAgentSettings() {
@@ -35,7 +28,6 @@ ChromeHttpUserAgentSettings::~ChromeHttpUserAgentSettings() {
void ChromeHttpUserAgentSettings::CleanupOnUIThread() {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
pref_accept_language_.Destroy();
- pref_accept_charset_.Destroy();
}
std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const {
@@ -49,17 +41,6 @@ std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const {
return last_http_accept_language_;
}
-std::string ChromeHttpUserAgentSettings::GetAcceptCharset() const {
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
- std::string new_pref_accept_charset = *pref_accept_charset_;
- if (new_pref_accept_charset != last_pref_accept_charset_) {
- last_http_accept_charset_ =
- net::HttpUtil::GenerateAcceptCharsetHeader(new_pref_accept_charset);
- last_pref_accept_charset_ = new_pref_accept_charset;
- }
- return last_http_accept_charset_;
-}
-
std::string ChromeHttpUserAgentSettings::GetUserAgent(const GURL& url) const {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
return content::GetUserAgent(url);
« no previous file with comments | « chrome/browser/net/chrome_http_user_agent_settings.h ('k') | chrome/browser/policy/cloud/device_management_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698