Chrome-side of moving webkit/glue/cache_manager.{h,cc} to the WebKit API layer.
This also includes a change to not have third_party/WebKit/WebKit/chromium/public
in the global include path. Most of the code changes pertain to this.
I also took this opportunity to do some renaming:
browser/cache_manager_host -> browser/renderer_host/web_cache_manager
R=brettw
Review URL: http://codereview.chromium.org/42194
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12085 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index fa81909..fb00145 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -29,22 +29,23 @@
#include "chrome/renderer/renderer_webkitclient_impl.h"
#include "chrome/renderer/user_script_slave.h"
#include "chrome/renderer/visitedlink_slave.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
#include "v8/include/v8.h"
#include "webkit/extensions/v8/gears_extension.h"
#include "webkit/extensions/v8/interval_extension.h"
#include "webkit/extensions/v8/playback_extension.h"
-#include "webkit/glue/cache_manager.h"
-
-#include "WebKit.h"
-#include "WebString.h"
#if defined(OS_WIN)
#include <windows.h>
#include <objbase.h>
#endif
-static const unsigned int kCacheStatsDelayMS = 2000 /* milliseconds */;
+using WebKit::WebCache;
+using WebKit::WebString;
+static const unsigned int kCacheStatsDelayMS = 2000 /* milliseconds */;
//-----------------------------------------------------------------------------
// Methods below are only called on the owner's thread:
@@ -196,13 +197,14 @@
size_t max_dead_capacity,
size_t capacity) {
EnsureWebKitInitialized();
- CacheManager::SetCapacities(min_dead_capacity, max_dead_capacity, capacity);
+ WebCache::setCapacities(
+ min_dead_capacity, max_dead_capacity, capacity);
}
void RenderThread::OnGetCacheResourceStats() {
EnsureWebKitInitialized();
- CacheManager::ResourceTypeStats stats;
- CacheManager::GetResourceTypeStats(&stats);
+ WebCache::ResourceTypeStats stats;
+ WebCache::getResourceTypeStats(&stats);
Send(new ViewHostMsg_ResourceTypeStats(stats));
}
@@ -212,8 +214,8 @@
void RenderThread::InformHostOfCacheStats() {
EnsureWebKitInitialized();
- CacheManager::UsageStats stats;
- CacheManager::GetUsageStats(&stats);
+ WebCache::UsageStats stats;
+ WebCache::getUsageStats(&stats);
Send(new ViewHostMsg_UpdatedCacheStats(stats));
}
@@ -240,7 +242,7 @@
// chrome-ui pages should not be accessible by normal content, and should
// also be unable to script anything but themselves (to help limit the damage
// that a corrupt chrome-ui page could cause).
- WebKit::WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme));
+ WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme));
WebKit::registerURLSchemeAsLocal(chrome_ui_scheme);
WebKit::registerURLSchemeAsNoAccess(chrome_ui_scheme);
