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

Side by Side Diff: chrome/browser/profiles/profile_io_data.h

Issue 7493025: Instantiate OriginBoundCertService in relevant places and do plumbing to pass it down to HttpNetw... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "chrome/browser/net/chrome_url_request_context.h" 17 #include "chrome/browser/net/chrome_url_request_context.h"
18 #include "chrome/browser/prefs/pref_member.h" 18 #include "chrome/browser/prefs/pref_member.h"
19 #include "content/browser/resource_context.h" 19 #include "content/browser/resource_context.h"
20 #include "net/base/cookie_monster.h" 20 #include "net/base/cookie_monster.h"
21 #include "net/base/origin_bound_cert_service.h"
21 22
22 class CommandLine; 23 class CommandLine;
23 class ChromeAppCacheService; 24 class ChromeAppCacheService;
24 class ChromeBlobStorageContext; 25 class ChromeBlobStorageContext;
25 class DesktopNotificationService; 26 class DesktopNotificationService;
26 class ExtensionInfoMap; 27 class ExtensionInfoMap;
27 class HostContentSettingsMap; 28 class HostContentSettingsMap;
28 class HostZoomMap; 29 class HostZoomMap;
29 class IOThread; 30 class IOThread;
30 class Profile; 31 class Profile;
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 void ShutdownOnUIThread(); 201 void ShutdownOnUIThread();
201 202
202 BooleanPrefMember* enable_referrers() const { 203 BooleanPrefMember* enable_referrers() const {
203 return &enable_referrers_; 204 return &enable_referrers_;
204 } 205 }
205 206
206 ChromeURLDataManagerBackend* chrome_url_data_manager_backend() const { 207 ChromeURLDataManagerBackend* chrome_url_data_manager_backend() const {
207 return chrome_url_data_manager_backend_.get(); 208 return chrome_url_data_manager_backend_.get();
208 } 209 }
209 210
211 net::OriginBoundCertService* origin_bound_cert_service() const {
212 return origin_bound_cert_service_.get();
213 }
rkn 2011/08/06 00:03:25 This breaks consistency because none of the others
willchan no longer on Chromium 2011/08/06 14:20:49 This is fine, although I'm not sure you need the a
rkn 2011/08/07 22:51:15 Done.
214 void set_origin_bound_cert_service(
215 net::OriginBoundCertService* origin_bound_cert_service) const {
216 origin_bound_cert_service_.reset(origin_bound_cert_service);
217 }
218
210 net::NetworkDelegate* network_delegate() const { 219 net::NetworkDelegate* network_delegate() const {
211 return network_delegate_.get(); 220 return network_delegate_.get();
212 } 221 }
213 222
214 net::DnsCertProvenanceChecker* dns_cert_checker() const { 223 net::DnsCertProvenanceChecker* dns_cert_checker() const {
215 return dns_cert_checker_.get(); 224 return dns_cert_checker_.get();
216 } 225 }
217 226
218 net::ProxyService* proxy_service() const { 227 net::ProxyService* proxy_service() const {
219 return proxy_service_.get(); 228 return proxy_service_.get();
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 mutable scoped_ptr<ProfileParams> profile_params_; 282 mutable scoped_ptr<ProfileParams> profile_params_;
274 283
275 // Member variables which are pointed to by the various context objects. 284 // Member variables which are pointed to by the various context objects.
276 mutable BooleanPrefMember enable_referrers_; 285 mutable BooleanPrefMember enable_referrers_;
277 mutable BooleanPrefMember clear_local_state_on_exit_; 286 mutable BooleanPrefMember clear_local_state_on_exit_;
278 mutable BooleanPrefMember safe_browsing_enabled_; 287 mutable BooleanPrefMember safe_browsing_enabled_;
279 288
280 // Pointed to by URLRequestContext. 289 // Pointed to by URLRequestContext.
281 mutable scoped_ptr<ChromeURLDataManagerBackend> 290 mutable scoped_ptr<ChromeURLDataManagerBackend>
282 chrome_url_data_manager_backend_; 291 chrome_url_data_manager_backend_;
292 mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_;
283 mutable scoped_ptr<net::NetworkDelegate> network_delegate_; 293 mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
284 mutable scoped_ptr<net::DnsCertProvenanceChecker> dns_cert_checker_; 294 mutable scoped_ptr<net::DnsCertProvenanceChecker> dns_cert_checker_;
285 mutable scoped_ptr<net::ProxyService> proxy_service_; 295 mutable scoped_ptr<net::ProxyService> proxy_service_;
286 mutable scoped_ptr<net::URLRequestJobFactory> job_factory_; 296 mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
287 297
288 // Pointed to by ResourceContext. 298 // Pointed to by ResourceContext.
289 mutable scoped_refptr<webkit_database::DatabaseTracker> database_tracker_; 299 mutable scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
290 mutable scoped_refptr<ChromeAppCacheService> appcache_service_; 300 mutable scoped_refptr<ChromeAppCacheService> appcache_service_;
291 mutable scoped_refptr<ChromeBlobStorageContext> blob_storage_context_; 301 mutable scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
292 mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_; 302 mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_;
(...skipping 19 matching lines...) Expand all
312 // Weak pointers to the request contexts. Only valid after LazyInitialize. 322 // Weak pointers to the request contexts. Only valid after LazyInitialize.
313 // These are weak so that they don't hold a reference to the RequestContext, 323 // These are weak so that they don't hold a reference to the RequestContext,
314 // because that holds a reference back to ProfileIOData. 324 // because that holds a reference back to ProfileIOData.
315 mutable base::WeakPtr<ChromeURLRequestContext> 325 mutable base::WeakPtr<ChromeURLRequestContext>
316 weak_extensions_request_context_; 326 weak_extensions_request_context_;
317 327
318 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 328 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
319 }; 329 };
320 330
321 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 331 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698