| 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_NET_COLUMN, | 47 { IDS_TASK_MANAGER_NET_COLUMN, |
| 48 arraysize("150 kiB/s") * kCharWidth, -1 }, | 48 arraysize("150 kiB/s") * kCharWidth, -1 }, |
| 49 { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, | 49 { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, |
| 50 arraysize("73099 ") * kCharWidth, -1 }, | 50 arraysize("73099 ") * kCharWidth, -1 }, |
| 51 { IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, | 51 { IDS_TASK_MANAGER_WEBCORE_IMAGE_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_SCRIPTS_CACHE_COLUMN, | 53 { IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, |
| 54 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, | 54 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
| 55 { IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, | 55 { IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, |
| 56 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, | 56 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
| 57 { IDS_TASK_MANAGER_FPS_COLUMN, | |
| 58 arraysize("100") * kCharWidth, -1 }, | |
| 59 { IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, | 57 { IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, |
| 60 arraysize("2000.0K") * kCharWidth, -1 }, | 58 arraysize("2000.0K") * kCharWidth, -1 }, |
| 61 { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, | 59 { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, |
| 62 arraysize("800 kB") * kCharWidth, -1 }, | 60 arraysize("800 kB") * kCharWidth, -1 }, |
| 63 { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, | 61 { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, |
| 64 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, | 62 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
| 65 { IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, | 63 { IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, |
| 66 arraysize("32767") * kCharWidth, -1 }, | 64 arraysize("32767") * kCharWidth, -1 }, |
| 67 { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, | 65 { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, |
| 68 arraysize("idlewakeups") * kCharWidth, -1 }, | 66 arraysize("idlewakeups") * kCharWidth, -1 }, |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 [self addColumnWithId:IDS_TASK_MANAGER_SHARED_MEM_COLUMN visible:NO]; | 294 [self addColumnWithId:IDS_TASK_MANAGER_SHARED_MEM_COLUMN visible:NO]; |
| 297 [self addColumnWithId:IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN visible:NO]; | 295 [self addColumnWithId:IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN visible:NO]; |
| 298 [self addColumnWithId:IDS_TASK_MANAGER_CPU_COLUMN visible:YES]; | 296 [self addColumnWithId:IDS_TASK_MANAGER_CPU_COLUMN visible:YES]; |
| 299 [self addColumnWithId:IDS_TASK_MANAGER_NET_COLUMN visible:YES]; | 297 [self addColumnWithId:IDS_TASK_MANAGER_NET_COLUMN visible:YES]; |
| 300 [self addColumnWithId:IDS_TASK_MANAGER_PROCESS_ID_COLUMN visible:YES]; | 298 [self addColumnWithId:IDS_TASK_MANAGER_PROCESS_ID_COLUMN visible:YES]; |
| 301 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN | 299 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN |
| 302 visible:NO]; | 300 visible:NO]; |
| 303 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN | 301 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN |
| 304 visible:NO]; | 302 visible:NO]; |
| 305 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN visible:NO]; | 303 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN visible:NO]; |
| 306 [self addColumnWithId:IDS_TASK_MANAGER_FPS_COLUMN visible:YES]; | |
| 307 [self addColumnWithId:IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN visible:NO]; | 304 [self addColumnWithId:IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN visible:NO]; |
| 308 [self addColumnWithId:IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN visible:NO]; | 305 [self addColumnWithId:IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN visible:NO]; |
| 309 [self addColumnWithId:IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN | 306 [self addColumnWithId:IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN |
| 310 visible:NO]; | 307 visible:NO]; |
| 311 [self addColumnWithId:IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN | 308 [self addColumnWithId:IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN |
| 312 visible:NO]; | 309 visible:NO]; |
| 313 [self addColumnWithId:IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN | 310 [self addColumnWithId:IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN |
| 314 visible:NO]; | 311 visible:NO]; |
| 315 [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO]; | 312 [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO]; |
| 316 } | 313 } |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 | 544 |
| 548 namespace chrome { | 545 namespace chrome { |
| 549 | 546 |
| 550 // Declared in browser_dialogs.h. | 547 // Declared in browser_dialogs.h. |
| 551 void ShowTaskManager(Browser* browser) { | 548 void ShowTaskManager(Browser* browser) { |
| 552 TaskManagerMac::Show(); | 549 TaskManagerMac::Show(); |
| 553 } | 550 } |
| 554 | 551 |
| 555 } // namespace chrome | 552 } // namespace chrome |
| 556 | 553 |
| OLD | NEW |