| Index: net/http/http_cache.h
|
| ===================================================================
|
| --- net/http/http_cache.h (revision 23344)
|
| +++ net/http/http_cache.h (working copy)
|
| @@ -146,6 +146,7 @@
|
| ActiveEntry* FindActiveEntry(const std::string& key);
|
| ActiveEntry* ActivateEntry(const std::string& key, disk_cache::Entry*);
|
| void DeactivateEntry(ActiveEntry* entry);
|
| + void SlowDeactivateEntry(ActiveEntry* entry);
|
| ActiveEntry* OpenEntry(const std::string& key);
|
| ActiveEntry* CreateEntry(const std::string& cache_key);
|
| void DestroyEntry(ActiveEntry* entry);
|
|
|
| Property changes on: net\http\http_cache.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/net/http/http_cache.h:r69-2775
|
| Merged /trunk/src/net/http/http_cache.h:r22701
|
|
|
|
|