Index: chrome/browser/renderer_host/web_cache_manager.cc |
=================================================================== |
--- chrome/browser/renderer_host/web_cache_manager.cc (revision 110571) |
+++ chrome/browser/renderer_host/web_cache_manager.cc (working copy) |
@@ -19,8 +19,8 @@ |
#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/common/render_messages.h" |
-#include "content/browser/renderer_host/browser_render_process_host.h" |
#include "content/public/browser/notification_service.h" |
+#include "content/public/browser/render_process_host.h" |
using base::Time; |
using base::TimeDelta; |
@@ -163,15 +163,15 @@ |
const content::NotificationDetails& details) { |
switch (type) { |
case content::NOTIFICATION_RENDERER_PROCESS_CREATED: { |
- RenderProcessHost* process = |
- content::Source<RenderProcessHost>(source).ptr(); |
- Add(process->id()); |
+ content::RenderProcessHost* process = |
+ content::Source<content::RenderProcessHost>(source).ptr(); |
+ Add(process->GetID()); |
break; |
} |
case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED: { |
- RenderProcessHost* process = |
- content::Source<RenderProcessHost>(source).ptr(); |
- Remove(process->id()); |
+ content::RenderProcessHost* process = |
+ content::Source<content::RenderProcessHost>(source).ptr(); |
+ Remove(process->GetID()); |
break; |
} |
default: |
@@ -308,7 +308,8 @@ |
// Inform each render process of its cache allocation. |
AllocationStrategy::const_iterator allocation = strategy.begin(); |
while (allocation != strategy.end()) { |
- RenderProcessHost* host = RenderProcessHost::FromID(allocation->first); |
+ content::RenderProcessHost* host = |
+ content::RenderProcessHost::FromID(allocation->first); |
if (host) { |
// This is the capacity this renderer has been allocated. |
size_t capacity = allocation->second; |
@@ -336,7 +337,8 @@ |
WebCacheManager::ClearCacheOccasion occasion) { |
std::set<int>::const_iterator iter = renderers.begin(); |
for (; iter != renderers.end(); ++iter) { |
- RenderProcessHost* host = RenderProcessHost::FromID(*iter); |
+ content::RenderProcessHost* host = |
+ content::RenderProcessHost::FromID(*iter); |
if (host) |
host->Send(new ChromeViewMsg_ClearCache(occasion == ON_NAVIGATION)); |
} |