Index: chrome/browser/ui/webui/task_manager/task_manager_handler.cc |
diff --git a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc |
index 35e0ce57f64e350a87dbd576b9a069b9f933e1ba..5eb4e4e7065869054f80e3e957a5113cc21ace20 100644 |
--- a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc |
+++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc |
@@ -104,6 +104,14 @@ Value* CreateColumnValue(const TaskManagerModel* tm, |
tm->GetFPS(i, &fps); |
return Value::CreateDoubleValue(fps); |
} |
+ if (column_name == "vidmem") |
+ return Value::CreateStringValue(tm->GetResourceVidmem(i)); |
+ if (column_name == "vidmemValue") { |
+ size_t vidmem; |
+ bool has_duplicates; |
+ tm->GetVidmem(i, &vidmem, &has_duplicates); |
yoshiki
2012/08/16 06:25:59
Could you handle explicitly GetVidmem() failure? I
yoshiki
2012/08/16 06:27:03
Sorry, not std::size_t, but double.
ccameron
2012/08/16 17:58:30
GetVidmem will set the value to its minimum (0) on
ccameron
2012/08/16 17:58:30
Done.
ccameron
2012/08/16 17:58:30
Done.
|
+ return Value::CreateDoubleValue(vidmem); |
+ } |
if (column_name == "sqliteMemoryUsed") |
return Value::CreateStringValue(tm->GetResourceSqliteMemoryUsed(i)); |
if (column_name == "sqliteMemoryUsedValue") { |
@@ -170,6 +178,7 @@ const ColumnType kColumnsList[] = { |
{"profileName", false, true}, |
{"networkUsage", true, true}, |
{"fps", true, true}, |
+ {"vidmemColumn", true, false}, |
yoshiki
2012/08/16 06:25:59
s/vidmemColumn/vidmem/
ccameron
2012/08/16 17:58:30
Done.
|
{"goatsTeleported", true, true}, |
{"canInspect", false, true}, |
{"canActivate", false, true} |