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

Side by Side Diff: chrome/browser/net/chrome_http_user_agent_settings.cc

Issue 1117613003: [chrome/browser/net] favor DCHECK_CURRENTLY_ON for better logs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 unified diff | Download patch
OLDNEW
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/chrome_content_client.h" 8 #include "chrome/common/chrome_content_client.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.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 12
13 ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) { 13 ChromeHttpUserAgentSettings::ChromeHttpUserAgentSettings(PrefService* prefs) {
14 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 14 DCHECK_CURRENTLY_ON(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(
21 content::BrowserThread::IO)); 21 content::BrowserThread::IO));
22 } 22 }
23 23
24 ChromeHttpUserAgentSettings::~ChromeHttpUserAgentSettings() { 24 ChromeHttpUserAgentSettings::~ChromeHttpUserAgentSettings() {
25 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); 25 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
26 } 26 }
27 27
28 void ChromeHttpUserAgentSettings::CleanupOnUIThread() { 28 void ChromeHttpUserAgentSettings::CleanupOnUIThread() {
29 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 29 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
30 pref_accept_language_.Destroy(); 30 pref_accept_language_.Destroy();
31 } 31 }
32 32
33 std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const { 33 std::string ChromeHttpUserAgentSettings::GetAcceptLanguage() const {
34 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); 34 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
35 std::string new_pref_accept_language = *pref_accept_language_; 35 std::string new_pref_accept_language = *pref_accept_language_;
36 if (new_pref_accept_language != last_pref_accept_language_) { 36 if (new_pref_accept_language != last_pref_accept_language_) {
37 last_http_accept_language_ = 37 last_http_accept_language_ =
38 net::HttpUtil::GenerateAcceptLanguageHeader(new_pref_accept_language); 38 net::HttpUtil::GenerateAcceptLanguageHeader(new_pref_accept_language);
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 { 44 std::string ChromeHttpUserAgentSettings::GetUserAgent() const {
45 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); 45 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
46 return ::GetUserAgent(); 46 return ::GetUserAgent();
47 } 47 }
48 48
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_extensions_network_delegate.cc ('k') | chrome/browser/net/chrome_network_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698