summaryrefslogtreecommitdiffstats
path: root/net/http/http_cache.h
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 07:25:40 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 07:25:40 +0000
commitf48b943fa405abdbff3278bd6d29bde6d1ef103b (patch)
treef3ad7676f0e484e5c783ef080cfdfea5cab32f0e /net/http/http_cache.h
parente0392155775eb3dc066d51e78a320a10627a74ad (diff)
downloadchromium_src-f48b943fa405abdbff3278bd6d29bde6d1ef103b.zip
chromium_src-f48b943fa405abdbff3278bd6d29bde6d1ef103b.tar.gz
chromium_src-f48b943fa405abdbff3278bd6d29bde6d1ef103b.tar.bz2
More reordering the methods in headers in net/.
BUG=68682 TEST=compiles Review URL: http://codereview.chromium.org/6186005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_cache.h')
-rw-r--r--net/http/http_cache.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 0641ca4..3438ba7 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -60,8 +60,6 @@ class HttpCache : public HttpTransactionFactory,
public base::SupportsWeakPtr<HttpCache>,
public base::NonThreadSafe {
public:
- ~HttpCache();
-
// The cache mode of operation.
enum Mode {
// Normal mode just behaves like a standard web cache.
@@ -145,6 +143,8 @@ class HttpCache : public HttpTransactionFactory,
NetLog* net_log,
BackendFactory* backend_factory);
+ ~HttpCache();
+
HttpTransactionFactory* network_layer() { return network_layer_.get(); }
// Retrieves the cache backend for this HttpCache instance. If the backend
@@ -157,12 +157,6 @@ class HttpCache : public HttpTransactionFactory,
// Returns the current backend (can be NULL).
disk_cache::Backend* GetCurrentBackend();
- // HttpTransactionFactory implementation:
- virtual int CreateTransaction(scoped_ptr<HttpTransaction>* trans);
- virtual HttpCache* GetCache();
- virtual HttpNetworkSession* GetSession();
- virtual void Suspend(bool suspend);
-
// Given a header data blob, convert it to a response info object.
static bool ParseResponseInfo(const char* data, int len,
HttpResponseInfo* response_info,
@@ -184,6 +178,12 @@ class HttpCache : public HttpTransactionFactory,
// immediately, but they will not be reusable. This is for debugging.
void CloseCurrentConnections();
+ // HttpTransactionFactory implementation:
+ virtual int CreateTransaction(scoped_ptr<HttpTransaction>* trans);
+ virtual HttpCache* GetCache();
+ virtual HttpNetworkSession* GetSession();
+ virtual void Suspend(bool suspend);
+
protected:
// Disk cache entry data indices.
enum {
@@ -211,15 +211,15 @@ class HttpCache : public HttpTransactionFactory,
typedef std::list<WorkItem*> WorkItemList;
struct ActiveEntry {
+ explicit ActiveEntry(disk_cache::Entry* entry);
+ ~ActiveEntry();
+
disk_cache::Entry* disk_entry;
Transaction* writer;
TransactionList readers;
TransactionList pending_queue;
bool will_process_pending_queue;
bool doomed;
-
- explicit ActiveEntry(disk_cache::Entry* entry);
- ~ActiveEntry();
};
typedef base::hash_map<std::string, ActiveEntry*> ActiveEntriesMap;