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 "chrome/common/chrome_content_client.h" | 7 #include "chrome/common/chrome_content_client.h" |
8 #include "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
9 #include "components/prefs/pref_service.h" | 9 #include "components/prefs/pref_service.h" |
10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
11 #include "net/http/http_util.h" | 11 #include "net/http/http_util.h" |
| 12 #include "net/http/http_util_icu.h" |
12 | 13 |
13 ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) { | 14 ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) { |
14 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 15 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
15 pref_accept_language_.Init(prefs::kAcceptLanguages, prefs); | 16 pref_accept_language_.Init(prefs::kAcceptLanguages, prefs); |
16 last_pref_accept_language_ = *pref_accept_language_; | 17 last_pref_accept_language_ = *pref_accept_language_; |
17 last_http_accept_language_ = | 18 last_http_accept_language_ = net::http_util_icu::GenerateAcceptLanguageHeader( |
18 net::HttpUtil::GenerateAcceptLanguageHeader(last_pref_accept_language_); | 19 last_pref_accept_language_); |
19 pref_accept_language_.MoveToThread( | 20 pref_accept_language_.MoveToThread( |
20 content::BrowserThread::GetTaskRunnerForThread( | 21 content::BrowserThread::GetTaskRunnerForThread( |
21 content::BrowserThread::IO)); | 22 content::BrowserThread::IO)); |
22 } | 23 } |
23 | 24 |
24 ChromeHttpUserAgentSettings::~ChromeHttpUserAgentSettings() { | 25 ChromeHttpUserAgentSettings::~ChromeHttpUserAgentSettings() { |
25 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 26 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
26 } | 27 } |
27 | 28 |
28 void ChromeHttpUserAgentSettings::CleanupOnUIThread() { | 29 void ChromeHttpUserAgentSettings::CleanupOnUIThread() { |
29 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 30 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
30 pref_accept_language_.Destroy(); | 31 pref_accept_language_.Destroy(); |
31 } | 32 } |
32 | 33 |
33 std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const { | 34 std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const { |
34 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 35 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
35 std::string new_pref_accept_language = *pref_accept_language_; | 36 std::string new_pref_accept_language = *pref_accept_language_; |
36 if (new_pref_accept_language != last_pref_accept_language_) { | 37 if (new_pref_accept_language != last_pref_accept_language_) { |
37 last_http_accept_language_ = | 38 last_http_accept_language_ = |
38 net::HttpUtil::GenerateAcceptLanguageHeader(new_pref_accept_language); | 39 net::http_util_icu::GenerateAcceptLanguageHeader( |
| 40 new_pref_accept_language); |
39 last_pref_accept_language_ = new_pref_accept_language; | 41 last_pref_accept_language_ = new_pref_accept_language; |
40 } | 42 } |
41 return last_http_accept_language_; | 43 return last_http_accept_language_; |
42 } | 44 } |
43 | 45 |
44 std::string ChromeHttpUserAgentSettings::GetUserAgent() const { | 46 std::string ChromeHttpUserAgentSettings::GetUserAgent() const { |
45 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 47 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
46 return ::GetUserAgent(); | 48 return ::GetUserAgent(); |
47 } | 49 } |
48 | |
OLD | NEW |