Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: chrome/browser/task_manager.cc

Issue 500118: Fix cpu/memory measurements on OS X. (Closed)
Patch Set: foobar Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_manager.cc
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index 43952a5ea0cf4f46e3e685f3be73cb212f1844b4..edd7b37552cbc7c4ad5ab2da48b0a99d75a83999 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -533,7 +533,14 @@ void TaskManagerModel::AddResource(TaskManager::Resource* resource) {
// Create the ProcessMetrics for this process if needed (not in map).
if (metrics_map_.find(process) == metrics_map_.end()) {
base::ProcessMetrics* pm =
+#if !defined(OS_MACOSX)
base::ProcessMetrics::CreateProcessMetrics(process);
+#else
+ // TODO(thakis): Write a port provider that knows the task ports of
+ // child processes.
+ base::ProcessMetrics::CreateProcessMetrics(process, NULL);
+#endif
+
metrics_map_[process] = pm;
}
@@ -770,12 +777,12 @@ void TaskManagerModel::OnJobRemoved(URLRequestJob* job) {
}
void TaskManagerModel::OnJobDone(URLRequestJob* job,
- const URLRequestStatus& status) {
+ const URLRequestStatus& status) {
}
void TaskManagerModel::OnJobRedirect(URLRequestJob* job,
- const GURL& location,
- int status_code) {
+ const GURL& location,
+ int status_code) {
}
void TaskManagerModel::OnBytesRead(URLRequestJob* job, int byte_count) {

Powered by Google App Engine
This is Rietveld 408576698