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

Side by Side Diff: chrome/browser/net/net_pref_observer.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
« no previous file with comments | « chrome/browser/net/net_log_temp_file.cc ('k') | chrome/browser/net/nss_context.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/net_pref_observer.h" 5 #include "chrome/browser/net/net_pref_observer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "components/pref_registry/pref_registry_syncable.h" 11 #include "components/pref_registry/pref_registry_syncable.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "net/http/http_stream_factory.h" 13 #include "net/http/http_stream_factory.h"
14 14
15 using content::BrowserThread; 15 using content::BrowserThread;
16 16
17 NetPrefObserver::NetPrefObserver(PrefService* prefs) { 17 NetPrefObserver::NetPrefObserver(PrefService* prefs) {
18 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 18 DCHECK_CURRENTLY_ON(BrowserThread::UI);
19 DCHECK(prefs); 19 DCHECK(prefs);
20 20
21 base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings, 21 base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings,
22 base::Unretained(this)); 22 base::Unretained(this));
23 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, prefs_callback); 23 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, prefs_callback);
24 24
25 ApplySettings(); 25 ApplySettings();
26 } 26 }
27 27
28 NetPrefObserver::~NetPrefObserver() { 28 NetPrefObserver::~NetPrefObserver() {
29 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 29 DCHECK_CURRENTLY_ON(BrowserThread::UI);
30 } 30 }
31 31
32 void NetPrefObserver::ApplySettings() { 32 void NetPrefObserver::ApplySettings() {
33 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 33 DCHECK_CURRENTLY_ON(BrowserThread::UI);
34 34
35 if (spdy_disabled_.IsManaged()) 35 if (spdy_disabled_.IsManaged())
36 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); 36 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
37 } 37 }
38 38
39 // static 39 // static
40 void NetPrefObserver::RegisterProfilePrefs( 40 void NetPrefObserver::RegisterProfilePrefs(
41 user_prefs::PrefRegistrySyncable* registry) { 41 user_prefs::PrefRegistrySyncable* registry) {
42 registry->RegisterBooleanPref( 42 registry->RegisterBooleanPref(
43 prefs::kNetworkPredictionEnabled, 43 prefs::kNetworkPredictionEnabled,
44 true, 44 true,
45 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 45 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
46 registry->RegisterBooleanPref(prefs::kDisableSpdy, false); 46 registry->RegisterBooleanPref(prefs::kDisableSpdy, false);
47 } 47 }
OLDNEW
« no previous file with comments | « chrome/browser/net/net_log_temp_file.cc ('k') | chrome/browser/net/nss_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698