OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/net/chrome_http_user_agent_settings.h" | 5 #include "chrome/browser/net/chrome_http_user_agent_settings.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
10 #include "content/public/common/content_client.h" | 10 #include "content/public/common/content_client.h" |
11 #include "net/http/http_util.h" | 11 #include "net/http/http_util.h" |
12 | 12 |
13 ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) { | 13 ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) { |
14 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 14 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
15 pref_accept_language_.Init(prefs::kAcceptLanguages, prefs); | 15 pref_accept_language_.Init(prefs::kAcceptLanguages, prefs); |
16 pref_accept_charset_.Init(prefs::kDefaultCharset, prefs); | |
mmenke
2013/03/08 15:37:49
This preference value should be removed, right?
pauljensen
2013/03/09 19:21:15
"git grep kDefaultCharset" turns up a few other us
| |
17 last_pref_accept_language_ = *pref_accept_language_; | 16 last_pref_accept_language_ = *pref_accept_language_; |
18 last_http_accept_language_ = | 17 last_http_accept_language_ = |
19 net::HttpUtil::GenerateAcceptLanguageHeader(last_pref_accept_language_); | 18 net::HttpUtil::GenerateAcceptLanguageHeader(last_pref_accept_language_); |
20 last_pref_accept_charset_ = *pref_accept_charset_; | |
21 last_http_accept_charset_ = | |
22 net::HttpUtil::GenerateAcceptCharsetHeader(last_pref_accept_charset_); | |
23 pref_accept_language_.MoveToThread( | 19 pref_accept_language_.MoveToThread( |
24 content::BrowserThread::GetMessageLoopProxyForThread( | 20 content::BrowserThread::GetMessageLoopProxyForThread( |
25 content::BrowserThread::IO)); | 21 content::BrowserThread::IO)); |
26 pref_accept_charset_.MoveToThread( | |
27 content::BrowserThread::GetMessageLoopProxyForThread( | |
28 content::BrowserThread::IO)); | |
29 } | 22 } |
30 | 23 |
31 ChromeHttpUserAgentSettings::~ChromeHttpUserAgentSettings() { | 24 ChromeHttpUserAgentSettings::~ChromeHttpUserAgentSettings() { |
32 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | 25 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
33 } | 26 } |
34 | 27 |
35 void ChromeHttpUserAgentSettings::CleanupOnUIThread() { | 28 void ChromeHttpUserAgentSettings::CleanupOnUIThread() { |
36 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 29 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
37 pref_accept_language_.Destroy(); | 30 pref_accept_language_.Destroy(); |
38 pref_accept_charset_.Destroy(); | |
39 } | 31 } |
40 | 32 |
41 std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const { | 33 std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const { |
42 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | 34 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
43 std::string new_pref_accept_language = *pref_accept_language_; | 35 std::string new_pref_accept_language = *pref_accept_language_; |
44 if (new_pref_accept_language != last_pref_accept_language_) { | 36 if (new_pref_accept_language != last_pref_accept_language_) { |
45 last_http_accept_language_ = | 37 last_http_accept_language_ = |
46 net::HttpUtil::GenerateAcceptLanguageHeader(new_pref_accept_language); | 38 net::HttpUtil::GenerateAcceptLanguageHeader(new_pref_accept_language); |
47 last_pref_accept_language_ = new_pref_accept_language; | 39 last_pref_accept_language_ = new_pref_accept_language; |
48 } | 40 } |
49 return last_http_accept_language_; | 41 return last_http_accept_language_; |
50 } | 42 } |
51 | 43 |
52 std::string ChromeHttpUserAgentSettings::GetAcceptCharset() const { | |
53 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | |
54 std::string new_pref_accept_charset = *pref_accept_charset_; | |
55 if (new_pref_accept_charset != last_pref_accept_charset_) { | |
56 last_http_accept_charset_ = | |
57 net::HttpUtil::GenerateAcceptCharsetHeader(new_pref_accept_charset); | |
58 last_pref_accept_charset_ = new_pref_accept_charset; | |
59 } | |
60 return last_http_accept_charset_; | |
61 } | |
62 | |
63 std::string ChromeHttpUserAgentSettings::GetUserAgent(const GURL& url) const { | 44 std::string ChromeHttpUserAgentSettings::GetUserAgent(const GURL& url) const { |
64 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | 45 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
65 return content::GetUserAgent(url); | 46 return content::GetUserAgent(url); |
66 } | 47 } |
67 | 48 |
OLD | NEW |