| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 5 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/mac/bundle_locations.h" | 10 #include "base/mac/bundle_locations.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, | 47 { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, |
| 48 arraysize("73099 ") * kCharWidth, -1 }, | 48 arraysize("73099 ") * kCharWidth, -1 }, |
| 49 { IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, | 49 { IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, |
| 50 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, | 50 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
| 51 { IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, | 51 { IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, |
| 52 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, | 52 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
| 53 { IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, | 53 { IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, |
| 54 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, | 54 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
| 55 { IDS_TASK_MANAGER_FPS_COLUMN, | 55 { IDS_TASK_MANAGER_FPS_COLUMN, |
| 56 arraysize("100") * kCharWidth, -1 }, | 56 arraysize("100") * kCharWidth, -1 }, |
| 57 { IDS_TASK_MANAGER_VIDMEM_COLUMN, |
| 58 arraysize("2000.0K") * kCharWidth, -1 }, |
| 57 { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, | 59 { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, |
| 58 arraysize("800 kB") * kCharWidth, -1 }, | 60 arraysize("800 kB") * kCharWidth, -1 }, |
| 59 { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, | 61 { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, |
| 60 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, | 62 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
| 61 { IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, | 63 { IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, |
| 62 arraysize("15 ") * kCharWidth, -1 }, | 64 arraysize("15 ") * kCharWidth, -1 }, |
| 63 }; | 65 }; |
| 64 | 66 |
| 65 class SortHelper { | 67 class SortHelper { |
| 66 public: | 68 public: |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 [self addColumnWithId:IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN visible:NO]; | 300 [self addColumnWithId:IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN visible:NO]; |
| 299 [self addColumnWithId:IDS_TASK_MANAGER_CPU_COLUMN visible:YES]; | 301 [self addColumnWithId:IDS_TASK_MANAGER_CPU_COLUMN visible:YES]; |
| 300 [self addColumnWithId:IDS_TASK_MANAGER_NET_COLUMN visible:YES]; | 302 [self addColumnWithId:IDS_TASK_MANAGER_NET_COLUMN visible:YES]; |
| 301 [self addColumnWithId:IDS_TASK_MANAGER_PROCESS_ID_COLUMN visible:NO]; | 303 [self addColumnWithId:IDS_TASK_MANAGER_PROCESS_ID_COLUMN visible:NO]; |
| 302 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN | 304 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN |
| 303 visible:NO]; | 305 visible:NO]; |
| 304 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN | 306 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN |
| 305 visible:NO]; | 307 visible:NO]; |
| 306 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN visible:NO]; | 308 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN visible:NO]; |
| 307 [self addColumnWithId:IDS_TASK_MANAGER_FPS_COLUMN visible:YES]; | 309 [self addColumnWithId:IDS_TASK_MANAGER_FPS_COLUMN visible:YES]; |
| 310 [self addColumnWithId:IDS_TASK_MANAGER_VIDMEM_COLUMN visible:NO]; |
| 308 [self addColumnWithId:IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN visible:NO]; | 311 [self addColumnWithId:IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN visible:NO]; |
| 309 [self addColumnWithId:IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN | 312 [self addColumnWithId:IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN |
| 310 visible:NO]; | 313 visible:NO]; |
| 311 [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO]; | 314 [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO]; |
| 312 } | 315 } |
| 313 | 316 |
| 314 // Creates a context menu for the table header that allows the user to toggle | 317 // Creates a context menu for the table header that allows the user to toggle |
| 315 // which columns should be shown and which should be hidden (like e.g. | 318 // which columns should be shown and which should be hidden (like e.g. |
| 316 // Task Manager.app's table header context menu). | 319 // Task Manager.app's table header context menu). |
| 317 - (void)setUpTableHeaderContextMenu { | 320 - (void)setUpTableHeaderContextMenu { |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 | 484 |
| 482 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: // WebCore CSS cache | 485 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: // WebCore CSS cache |
| 483 if (!model_->IsResourceFirstInGroup(row)) | 486 if (!model_->IsResourceFirstInGroup(row)) |
| 484 return @""; | 487 return @""; |
| 485 return base::SysUTF16ToNSString( | 488 return base::SysUTF16ToNSString( |
| 486 model_->GetResourceWebCoreCSSCacheSize(row)); | 489 model_->GetResourceWebCoreCSSCacheSize(row)); |
| 487 | 490 |
| 488 case IDS_TASK_MANAGER_FPS_COLUMN: | 491 case IDS_TASK_MANAGER_FPS_COLUMN: |
| 489 return base::SysUTF16ToNSString(model_->GetResourceFPS(row)); | 492 return base::SysUTF16ToNSString(model_->GetResourceFPS(row)); |
| 490 | 493 |
| 494 case IDS_TASK_MANAGER_VIDMEM_COLUMN: |
| 495 return base::SysUTF16ToNSString(model_->GetResourceVidmem(row)); |
| 496 |
| 491 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: | 497 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: |
| 492 if (!model_->IsResourceFirstInGroup(row)) | 498 if (!model_->IsResourceFirstInGroup(row)) |
| 493 return @""; | 499 return @""; |
| 494 return base::SysUTF16ToNSString( | 500 return base::SysUTF16ToNSString( |
| 495 model_->GetResourceSqliteMemoryUsed(row)); | 501 model_->GetResourceSqliteMemoryUsed(row)); |
| 496 | 502 |
| 497 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: | 503 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: |
| 498 if (!model_->IsResourceFirstInGroup(row)) | 504 if (!model_->IsResourceFirstInGroup(row)) |
| 499 return @""; | 505 return @""; |
| 500 return base::SysUTF16ToNSString( | 506 return base::SysUTF16ToNSString( |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 // "Task Manager" so close the existing window and fall through to | 653 // "Task Manager" so close the existing window and fall through to |
| 648 // open a new one. | 654 // open a new one. |
| 649 [[instance_->window_controller_ window] close]; | 655 [[instance_->window_controller_ window] close]; |
| 650 } | 656 } |
| 651 } | 657 } |
| 652 // Create a new instance. | 658 // Create a new instance. |
| 653 instance_ = new TaskManagerMac(TaskManager::GetInstance(), | 659 instance_ = new TaskManagerMac(TaskManager::GetInstance(), |
| 654 highlight_background_resources); | 660 highlight_background_resources); |
| 655 instance_->model_->StartUpdating(); | 661 instance_->model_->StartUpdating(); |
| 656 } | 662 } |
| OLD | NEW |