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

Unified Diff: chrome/browser/profiles/profile_io_data.h

Issue 182993003: Add the ability for DevTools to wrap network transactions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added DevTools part of patch. Resolved some comments Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index d849d2811a1725f02cdd73852471fd6a2bc100ba..4c670aeecaf37aa3203ab237df2f81be9e840f9d 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -16,6 +16,7 @@
#include "base/prefs/pref_member.h"
#include "base/synchronization/lock.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
+#include "chrome/browser/devtools/devtools_network_controller.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/profiles/storage_partition_descriptor.h"
@@ -23,6 +24,7 @@
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/resource_context.h"
#include "net/cookies/cookie_monster.h"
+#include "net/http/http_cache.h"
#include "net/http/http_network_session.h"
#include "net/url_request/url_request_job_factory.h"
@@ -183,6 +185,10 @@ class ProfileIOData {
return transport_security_state_.get();
}
+ DevToolsNetworkController* devtools_network_controller() const {
+ return devtools_network_controller_;
+ }
+
#if defined(OS_CHROMEOS)
std::string username_hash() const {
return username_hash_;
@@ -349,11 +355,10 @@ class ProfileIOData {
// URLRequests may be accessing.
void DestroyResourceContext();
- // Fills in fields of params using values from main_request_context_ and the
- // IOThread associated with profile_params.
- void PopulateNetworkSessionParams(
+ // Creates network session and network transaction factory.
+ net::HttpCache* CreateMainHttpFactory(
const ProfileParams* profile_params,
- net::HttpNetworkSession::Params* params) const;
+ net::HttpCache::BackendFactory* main_backend) const;
void SetCookieSettingsForTesting(CookieSettings* cookie_settings);
@@ -550,6 +555,8 @@ class ProfileIOData {
mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_;
#endif
+ mutable DevToolsNetworkController* devtools_network_controller_;
+
// TODO(jhawkins): Remove once crbug.com/102004 is fixed.
bool initialized_on_UI_thread_;

Powered by Google App Engine
This is Rietveld 408576698