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

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/net/predictor.h ('k') | chrome/browser/net/pref_proxy_config_tracker_impl.h » ('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/predictor.h" 5 #include "chrome/browser/net/predictor.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <set> 9 #include <set>
10 #include <sstream> 10 #include <sstream>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/stl_util.h" 16 #include "base/stl_util.h"
17 #include "base/string_split.h" 17 #include "base/string_split.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/stringprintf.h" 19 #include "base/stringprintf.h"
20 #include "base/synchronization/waitable_event.h" 20 #include "base/synchronization/waitable_event.h"
21 #include "base/threading/thread_restrictions.h" 21 #include "base/threading/thread_restrictions.h"
22 #include "base/time.h" 22 #include "base/time.h"
23 #include "base/values.h" 23 #include "base/values.h"
24 #include "chrome/browser/io_thread.h" 24 #include "chrome/browser/io_thread.h"
25 #include "chrome/browser/net/preconnect.h" 25 #include "chrome/browser/net/preconnect.h"
26 #include "chrome/browser/prefs/pref_registry_syncable.h"
26 #include "chrome/browser/prefs/pref_service.h" 27 #include "chrome/browser/prefs/pref_service.h"
27 #include "chrome/browser/prefs/scoped_user_pref_update.h" 28 #include "chrome/browser/prefs/scoped_user_pref_update.h"
28 #include "chrome/browser/prefs/session_startup_pref.h" 29 #include "chrome/browser/prefs/session_startup_pref.h"
29 #include "chrome/common/chrome_switches.h" 30 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
31 #include "content/public/browser/browser_thread.h" 32 #include "content/public/browser/browser_thread.h"
32 #include "net/base/address_list.h" 33 #include "net/base/address_list.h"
33 #include "net/base/completion_callback.h" 34 #include "net/base/completion_callback.h"
34 #include "net/base/host_port_pair.h" 35 #include "net/base/host_port_pair.h"
35 #include "net/base/host_resolver.h" 36 #include "net/base/host_resolver.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 } 148 }
148 149
149 // static 150 // static
150 Predictor* Predictor::CreatePredictor(bool preconnect_enabled, 151 Predictor* Predictor::CreatePredictor(bool preconnect_enabled,
151 bool simple_shutdown) { 152 bool simple_shutdown) {
152 if (simple_shutdown) 153 if (simple_shutdown)
153 return new SimplePredictor(preconnect_enabled); 154 return new SimplePredictor(preconnect_enabled);
154 return new Predictor(preconnect_enabled); 155 return new Predictor(preconnect_enabled);
155 } 156 }
156 157
157 void Predictor::RegisterUserPrefs(PrefServiceSyncable* user_prefs) { 158 void Predictor::RegisterUserPrefs(PrefRegistrySyncable* registry) {
158 user_prefs->RegisterListPref(prefs::kDnsPrefetchingStartupList, 159 registry->RegisterListPref(prefs::kDnsPrefetchingStartupList,
159 PrefServiceSyncable::UNSYNCABLE_PREF); 160 PrefRegistrySyncable::UNSYNCABLE_PREF);
160 user_prefs->RegisterListPref(prefs::kDnsPrefetchingHostReferralList, 161 registry->RegisterListPref(prefs::kDnsPrefetchingHostReferralList,
161 PrefServiceSyncable::UNSYNCABLE_PREF); 162 PrefRegistrySyncable::UNSYNCABLE_PREF);
162 } 163 }
163 164
164 // --------------------- Start UI methods. ------------------------------------ 165 // --------------------- Start UI methods. ------------------------------------
165 166
166 void Predictor::InitNetworkPredictor(PrefService* user_prefs, 167 void Predictor::InitNetworkPredictor(PrefService* user_prefs,
167 PrefService* local_state, 168 PrefService* local_state,
168 IOThread* io_thread, 169 IOThread* io_thread,
169 net::URLRequestContextGetter* getter) { 170 net::URLRequestContextGetter* getter) {
170 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 171 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
171 172
(...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after
1185 IOThread* io_thread, 1186 IOThread* io_thread,
1186 net::URLRequestContextGetter* getter) { 1187 net::URLRequestContextGetter* getter) {
1187 // Empty function for unittests. 1188 // Empty function for unittests.
1188 } 1189 }
1189 1190
1190 void SimplePredictor::ShutdownOnUIThread(PrefService* user_prefs) { 1191 void SimplePredictor::ShutdownOnUIThread(PrefService* user_prefs) {
1191 SetShutdown(true); 1192 SetShutdown(true);
1192 } 1193 }
1193 1194
1194 } // namespace chrome_browser_net 1195 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « chrome/browser/net/predictor.h ('k') | chrome/browser/net/pref_proxy_config_tracker_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698