Index: chrome/browser/ui/cocoa/task_manager_mac.mm |
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm |
index 3f622c166afa4af9b529929e74731778db0ac4dc..dcc571daeee9d487faad3d778285e71a5cddd796 100644 |
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm |
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm |
@@ -54,6 +54,8 @@ const struct ColumnWidth { |
arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
{ IDS_TASK_MANAGER_FPS_COLUMN, |
arraysize("100") * kCharWidth, -1 }, |
+ { IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, |
+ arraysize("2000.0K") * kCharWidth, -1 }, |
{ IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, |
arraysize("800 kB") * kCharWidth, -1 }, |
{ IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, |
@@ -305,6 +307,7 @@ class SortHelper { |
visible:NO]; |
[self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN visible:NO]; |
[self addColumnWithId:IDS_TASK_MANAGER_FPS_COLUMN visible:YES]; |
+ [self addColumnWithId:IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN visible:NO]; |
[self addColumnWithId:IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN visible:NO]; |
[self addColumnWithId:IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN |
visible:NO]; |
@@ -488,6 +491,9 @@ class SortHelper { |
case IDS_TASK_MANAGER_FPS_COLUMN: |
return base::SysUTF16ToNSString(model_->GetResourceFPS(row)); |
+ case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN: |
+ return base::SysUTF16ToNSString(model_->GetResourceVideoMemory(row)); |
+ |
case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: |
if (!model_->IsResourceFirstInGroup(row)) |
return @""; |