diff options
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/task_manager_mac.mm | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/task_manager_mac.mm b/chrome/browser/cocoa/task_manager_mac.mm index c977dd9..bc8d72a 100644 --- a/chrome/browser/cocoa/task_manager_mac.mm +++ b/chrome/browser/cocoa/task_manager_mac.mm @@ -49,6 +49,10 @@ const struct ColumnWidth { arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, { IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, + { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, + arraysize("800 kB") * kCharWidth, -1 }, + { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, + arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, { IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, arraysize("15 ") * kCharWidth, -1 }, }; @@ -274,6 +278,9 @@ class SortHelper { [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN visible:NO]; [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_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]; [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO]; } @@ -419,6 +426,18 @@ class SortHelper { return base::SysUTF16ToNSString( model_->GetResourceWebCoreCSSCacheSize(row)); + case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: + if (!model_->IsResourceFirstInGroup(row)) + return @""; + return base::SysUTF16ToNSString( + model_->GetResourceSqliteMemoryUsed(row)); + + case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: + if (!model_->IsResourceFirstInGroup(row)) + return @""; + return base::SysUTF16ToNSString( + model_->GetResourceV8MemoryAllocatedSize(row)); + case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN: // Goats Teleported! return base::SysUTF16ToNSString(model_->GetResourceGoatsTeleported(row)); |