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

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

Issue 2841163002: Make ProfileIOData's ProxyService fetch PACs with the main URLRequestContext (Closed)
Patch Set: Minor test cleanup Created 3 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 #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 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 442
443 typedef std::map<StoragePartitionDescriptor, 443 typedef std::map<StoragePartitionDescriptor,
444 net::URLRequestContext*, 444 net::URLRequestContext*,
445 StoragePartitionDescriptorLess> 445 StoragePartitionDescriptorLess>
446 URLRequestContextMap; 446 URLRequestContextMap;
447 447
448 // -------------------------------------------- 448 // --------------------------------------------
449 // Virtual interface for subtypes to implement: 449 // Virtual interface for subtypes to implement:
450 // -------------------------------------------- 450 // --------------------------------------------
451 451
452 // Does any necessary addition configuration of the network delegate,
eroman 2017/05/02 21:29:34 additional
mmenke 2017/05/02 21:33:59 Done.
453 // including composing it with other NetworkDelegates, if needed. By default,
454 // just returns the input NetworkDelegate.
455 virtual std::unique_ptr<net::NetworkDelegate> ConfigureNetworkDelegate(
456 IOThread* io_thread,
457 std::unique_ptr<ChromeNetworkDelegate> chrome_network_delegate) const;
458
452 // Does the actual initialization of the ProfileIOData subtype. Subtypes 459 // Does the actual initialization of the ProfileIOData subtype. Subtypes
453 // should use the static helper functions above to implement this. 460 // should use the static helper functions above to implement this.
454 virtual void InitializeInternal( 461 virtual void InitializeInternal(
455 std::unique_ptr<ChromeNetworkDelegate> chrome_network_delegate,
456 ProfileParams* profile_params, 462 ProfileParams* profile_params,
457 content::ProtocolHandlerMap* protocol_handlers, 463 content::ProtocolHandlerMap* protocol_handlers,
458 content::URLRequestInterceptorScopedVector request_interceptors) 464 content::URLRequestInterceptorScopedVector request_interceptors)
459 const = 0; 465 const = 0;
460 466
461 // Initializes the RequestContext for extensions. 467 // Initializes the RequestContext for extensions.
462 virtual void InitializeExtensionsRequestContext( 468 virtual void InitializeExtensionsRequestContext(
463 ProfileParams* profile_params) const = 0; 469 ProfileParams* profile_params) const = 0;
464 // Does an on-demand initialization of a RequestContext for the given 470 // Does an on-demand initialization of a RequestContext for the given
465 // isolated app. 471 // isolated app.
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 mutable std::unique_ptr<certificate_transparency::TreeStateTracker> 617 mutable std::unique_ptr<certificate_transparency::TreeStateTracker>
612 ct_tree_tracker_; 618 ct_tree_tracker_;
613 mutable base::Closure ct_tree_tracker_unregistration_; 619 mutable base::Closure ct_tree_tracker_unregistration_;
614 620
615 const Profile::ProfileType profile_type_; 621 const Profile::ProfileType profile_type_;
616 622
617 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 623 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
618 }; 624 };
619 625
620 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 626 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698