Index: chrome/browser/task_manager/task_manager.h |
diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h |
index 2b8d0a215610a91cc54122b0958353ffa3ff1a63..bfe71741c240c645c00d217c3b4e0122fa2fe98e 100644 |
--- a/chrome/browser/task_manager/task_manager.h |
+++ b/chrome/browser/task_manager/task_manager.h |
@@ -20,7 +20,6 @@ |
#include "base/string16.h" |
#include "base/timer.h" |
#include "chrome/browser/renderer_host/web_cache_manager.h" |
-#include "net/url_request/url_request_job_tracker.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" |
class Extension; |
@@ -31,6 +30,9 @@ class TaskManagerModel; |
namespace base { |
class ProcessMetrics; |
} |
+namespace net { |
+class URLRequest; |
+} |
// This class is a singleton. |
class TaskManager { |
@@ -214,8 +216,7 @@ class TaskManagerModelObserver { |
}; |
// The model that the TaskManager is using. |
-class TaskManagerModel : public net::URLRequestJobTracker::JobObserver, |
- public base::RefCountedThreadSafe<TaskManagerModel> { |
+class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> { |
public: |
explicit TaskManagerModel(TaskManager* task_manager); |
@@ -297,18 +298,6 @@ class TaskManagerModel : public net::URLRequestJobTracker::JobObserver, |
// Returns Extension of given resource or NULL if not applicable. |
const Extension* GetResourceExtension(int index) const; |
- // JobObserver methods: |
- virtual void OnJobAdded(net::URLRequestJob* job); |
- virtual void OnJobRemoved(net::URLRequestJob* job); |
- virtual void OnJobDone(net::URLRequestJob* job, |
- const net::URLRequestStatus& status); |
- virtual void OnJobRedirect(net::URLRequestJob* job, |
- const GURL& location, |
- int status_code); |
- virtual void OnBytesRead(net::URLRequestJob* job, |
- const char* buf, |
- int byte_count); |
- |
void AddResource(TaskManager::Resource* resource); |
void RemoveResource(TaskManager::Resource* resource); |
@@ -329,6 +318,8 @@ class TaskManagerModel : public net::URLRequestJobTracker::JobObserver, |
size_t v8_memory_allocated, |
size_t v8_memory_used); |
+ void NotifyBytesRead(const net::URLRequest& request, int bytes_read); |
+ |
private: |
friend class base::RefCountedThreadSafe<TaskManagerModel>; |
FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, RefreshCalled); |
@@ -379,10 +370,6 @@ class TaskManagerModel : public net::URLRequestJobTracker::JobObserver, |
void AddItem(TaskManager::Resource* resource, bool notify_table); |
void RemoveItem(TaskManager::Resource* resource); |
- // Register for network usage updates |
- void RegisterForJobDoneNotifications(); |
- void UnregisterForJobDoneNotifications(); |
- |
// Returns the network usage (in bytes per seconds) for the specified |
// resource. That's the value retrieved at the last timer's tick. |
int64 GetNetworkUsageForResource(TaskManager::Resource* resource) const; |