| 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 7b05e0950e346955d4b60632cb902a556772ccbe..d527af40584bde2711bd447868a0594f64e33ca6 100644
|
| --- a/chrome/browser/ui/cocoa/task_manager_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
|
| @@ -436,85 +436,8 @@ class SortHelper {
|
|
|
| - (NSString*)modelTextForRow:(int)row column:(int)columnId {
|
| DCHECK_LT(static_cast<size_t>(row), viewToModelMap_.size());
|
| - row = viewToModelMap_[row];
|
| - switch (columnId) {
|
| - case IDS_TASK_MANAGER_TASK_COLUMN: // Process
|
| - return base::SysUTF16ToNSString(model_->GetResourceTitle(row));
|
| -
|
| - case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN: // Profile Name
|
| - return base::SysUTF16ToNSString(model_->GetResourceProfileName(row));
|
| -
|
| - case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN: // Memory
|
| - if (!model_->IsResourceFirstInGroup(row))
|
| - return @"";
|
| - return base::SysUTF16ToNSString(model_->GetResourcePrivateMemory(row));
|
| -
|
| - case IDS_TASK_MANAGER_SHARED_MEM_COLUMN: // Memory
|
| - if (!model_->IsResourceFirstInGroup(row))
|
| - return @"";
|
| - return base::SysUTF16ToNSString(model_->GetResourceSharedMemory(row));
|
| -
|
| - case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN: // Memory
|
| - if (!model_->IsResourceFirstInGroup(row))
|
| - return @"";
|
| - return base::SysUTF16ToNSString(model_->GetResourcePhysicalMemory(row));
|
| -
|
| - case IDS_TASK_MANAGER_CPU_COLUMN: // CPU
|
| - if (!model_->IsResourceFirstInGroup(row))
|
| - return @"";
|
| - return base::SysUTF16ToNSString(model_->GetResourceCPUUsage(row));
|
| -
|
| - case IDS_TASK_MANAGER_NET_COLUMN: // Net
|
| - return base::SysUTF16ToNSString(model_->GetResourceNetworkUsage(row));
|
| -
|
| - case IDS_TASK_MANAGER_PROCESS_ID_COLUMN: // Process ID
|
| - if (!model_->IsResourceFirstInGroup(row))
|
| - return @"";
|
| - return base::SysUTF16ToNSString(model_->GetResourceProcessId(row));
|
| -
|
| - case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN: // WebCore image cache
|
| - if (!model_->IsResourceFirstInGroup(row))
|
| - return @"";
|
| - return base::SysUTF16ToNSString(
|
| - model_->GetResourceWebCoreImageCacheSize(row));
|
| -
|
| - case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN: // WebCore script cache
|
| - if (!model_->IsResourceFirstInGroup(row))
|
| - return @"";
|
| - return base::SysUTF16ToNSString(
|
| - model_->GetResourceWebCoreScriptsCacheSize(row));
|
| -
|
| - case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: // WebCore CSS cache
|
| - if (!model_->IsResourceFirstInGroup(row))
|
| - return @"";
|
| - return base::SysUTF16ToNSString(
|
| - model_->GetResourceWebCoreCSSCacheSize(row));
|
| -
|
| - 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 @"";
|
| - 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));
|
| -
|
| - default:
|
| - NOTREACHED();
|
| - return @"";
|
| - }
|
| + return base::SysUTF16ToNSString(
|
| + model_->GetResourceById(viewToModelMap_[row], columnId));
|
| }
|
|
|
| - (id)tableView:(NSTableView*)tableView
|
|
|