diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:03:53 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:03:53 +0000 |
| commit | 9e743cddfd631038fe6f1cdde050e18d61319ec6 (patch) | |
| tree | 7ef974e43b23f570433fe819bcd07966165c517f /net/http/http_cache_transaction.h | |
| parent | 2e7aff66fe443c29b2fc14a776dca5512b0b4729 (diff) | |
| download | chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.zip chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.tar.gz chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.tar.bz2 | |
Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).
This makes it possible to associate a single NetLog with a URLRequestContext, and then attach observers to that log to watch the stream of events.
This changelist attempts to do the most direct translation, so there will be subsequent iterations to clean up.
The user-visible behavior should remain unchanged.
BUG=37421
Review URL: http://codereview.chromium.org/848006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_cache_transaction.h')
| -rw-r--r-- | net/http/http_cache_transaction.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h index 936c2e3..9ad50e9 100644 --- a/net/http/http_cache_transaction.h +++ b/net/http/http_cache_transaction.h @@ -8,6 +8,7 @@ #ifndef NET_HTTP_HTTP_CACHE_TRANSACTION_H_ #define NET_HTTP_HTTP_CACHE_TRANSACTION_H_ +#include "net/base/net_log.h" #include "net/http/http_cache.h" #include "net/http/http_response_info.h" #include "net/http/http_transaction.h" @@ -25,7 +26,8 @@ class HttpCache::Transaction : public HttpTransaction { virtual ~Transaction(); // HttpTransaction methods: - virtual int Start(const HttpRequestInfo*, CompletionCallback*, LoadLog*); + virtual int Start(const HttpRequestInfo*, CompletionCallback*, + const BoundNetLog&); virtual int RestartIgnoringLastError(CompletionCallback* callback); virtual int RestartWithCertificate(X509Certificate* client_cert, CompletionCallback* callback); @@ -194,7 +196,7 @@ class HttpCache::Transaction : public HttpTransaction { int DoCacheWriteDataComplete(int result); // Sets request_ and fields derived from it. - void SetRequest(LoadLog* load_log, const HttpRequestInfo* request); + void SetRequest(const BoundNetLog& net_log, const HttpRequestInfo* request); // Returns true if the request should be handled exclusively by the network // layer (skipping the cache entirely). @@ -299,7 +301,7 @@ class HttpCache::Transaction : public HttpTransaction { State next_state_; const HttpRequestInfo* request_; - scoped_refptr<LoadLog> load_log_; + BoundNetLog net_log_; scoped_ptr<HttpRequestInfo> custom_request_; // If extra_headers specified a "if-modified-since" or "if-none-match", // |external_validation_| contains the value of those headers. |