Chromium Code Reviews| Index: chrome/browser/renderer_host/chrome_render_message_filter.cc |
| diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc |
| index 75d290db8216a98bd495e46fbdca3dc72ad10c51..03317a2d31923c5ad5bfd63c128f12c0d63e2146 100644 |
| --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc |
| +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc |
| @@ -22,7 +22,7 @@ |
| #include "chrome/browser/net/chrome_url_request_context.h" |
| #include "chrome/browser/net/predictor.h" |
| #include "chrome/browser/profiles/profile.h" |
| -#include "chrome/browser/task_manager/task_manager.h" |
| +#include "chrome/browser/renderer_host/web_cache_manager.h" |
| #include "chrome/common/chrome_notification_types.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/extensions/extension_file_util.h" |
| @@ -42,6 +42,10 @@ |
| #include "chrome/browser/browser_about_handler.h" |
| #endif |
| +#if defined(ENABLE_TASK_MANAGER) |
|
jam
2012/04/02 15:49:28
ditto
|
| +#include "chrome/browser/task_manager/task_manager.h" |
| +#endif // defined(ENABLE_TASK_MANAGER) |
| + |
| using content::BrowserThread; |
| using WebKit::WebCache; |
| using WebKit::WebSecurityOrigin; |
| @@ -186,8 +190,10 @@ void ChromeRenderMessageFilter::OnResourceTypeStats( |
| static_cast<int>(stats.fonts.size / 1024)); |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| +#if defined(ENABLE_TASK_MANAGER) |
| TaskManager::GetInstance()->model()->NotifyResourceTypeStats( |
| base::GetProcId(peer_handle()), stats); |
| +#endif // defined(ENABLE_TASK_MANAGER) |
| } |
| void ChromeRenderMessageFilter::OnUpdatedCacheStats( |
| @@ -207,8 +213,10 @@ void ChromeRenderMessageFilter::OnFPS(int routing_id, float fps) { |
| base::ProcessId renderer_id = base::GetProcId(peer_handle()); |
| +#if defined(ENABLE_TASK_MANAGER) |
| TaskManager::GetInstance()->model()->NotifyFPS( |
| renderer_id, routing_id, fps); |
| +#endif // defined(ENABLE_TASK_MANAGER) |
| FPSDetails details(routing_id, fps); |
| content::NotificationService::current()->Notify( |
| @@ -230,10 +238,12 @@ void ChromeRenderMessageFilter::OnV8HeapStats(int v8_memory_allocated, |
| base::ProcessId renderer_id = base::GetProcId(peer_handle()); |
| +#if defined(ENABLE_TASK_MANAGER) |
| TaskManager::GetInstance()->model()->NotifyV8HeapStats( |
| renderer_id, |
| static_cast<size_t>(v8_memory_allocated), |
| static_cast<size_t>(v8_memory_used)); |
| +#endif // defined(ENABLE_TASK_MANAGER) |
| V8HeapStatsDetails details(v8_memory_allocated, v8_memory_used); |
| content::NotificationService::current()->Notify( |