| 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/user_agent.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 last_pref_accept_language_ = *pref_accept_language_; | 16 last_pref_accept_language_ = *pref_accept_language_; |
| 17 last_http_accept_language_ = | 17 last_http_accept_language_ = |
| 18 net::HttpUtil::GenerateAcceptLanguageHeader(last_pref_accept_language_); | 18 net::HttpUtil::GenerateAcceptLanguageHeader(last_pref_accept_language_); |
| 19 pref_accept_language_.MoveToThread( | 19 pref_accept_language_.MoveToThread( |
| 20 content::BrowserThread::GetMessageLoopProxyForThread( | 20 content::BrowserThread::GetMessageLoopProxyForThread( |
| (...skipping 18 matching lines...) Expand all Loading... |
| 39 last_pref_accept_language_ = new_pref_accept_language; | 39 last_pref_accept_language_ = new_pref_accept_language; |
| 40 } | 40 } |
| 41 return last_http_accept_language_; | 41 return last_http_accept_language_; |
| 42 } | 42 } |
| 43 | 43 |
| 44 std::string ChromeHttpUserAgentSettings::GetUserAgent(const GURL& url) const { | 44 std::string ChromeHttpUserAgentSettings::GetUserAgent(const GURL& url) const { |
| 45 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); | 45 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
| 46 return content::GetUserAgent(url); | 46 return content::GetUserAgent(url); |
| 47 } | 47 } |
| 48 | 48 |
| OLD | NEW |