Chromium Code Reviews| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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, | 57 { IDS_TASK_MANAGER_FPS_COLUMN, |
| 58 arraysize("100") * kCharWidth, -1 }, | 58 arraysize("100") * kCharWidth, -1 }, |
| 59 { IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, | 59 { IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, |
| 60 arraysize("2000.0K") * kCharWidth, -1 }, | 60 arraysize("2000.0K") * kCharWidth, -1 }, |
| 61 { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, | 61 { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, |
| 62 arraysize("800 kB") * kCharWidth, -1 }, | 62 arraysize("800 kB") * kCharWidth, -1 }, |
| 63 { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, | 63 { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, |
| 64 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, | 64 arraysize("2000.0K (2000.0 live)") * kCharWidth, -1 }, |
| 65 { IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, | |
| 66 arraysize("100") * kCharWidth, -1 }, | |
|
Peter Kasting
2013/12/17 23:12:29
Shouldn't this be 5 chars instead of 3?
bradn
2013/12/20 00:35:37
Done.
| |
| 65 { IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, | 67 { IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, |
| 66 arraysize("15 ") * kCharWidth, -1 }, | 68 arraysize("15 ") * kCharWidth, -1 }, |
| 67 }; | 69 }; |
| 68 | 70 |
| 69 class SortHelper { | 71 class SortHelper { |
| 70 public: | 72 public: |
| 71 SortHelper(TaskManagerModel* model, NSSortDescriptor* column) | 73 SortHelper(TaskManagerModel* model, NSSortDescriptor* column) |
| 72 : sort_column_([[column key] intValue]), | 74 : sort_column_([[column key] intValue]), |
| 73 ascending_([column ascending]), | 75 ascending_([column ascending]), |
| 74 model_(model) {} | 76 model_(model) {} |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 297 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN | 299 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN |
| 298 visible:NO]; | 300 visible:NO]; |
| 299 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN | 301 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN |
| 300 visible:NO]; | 302 visible:NO]; |
| 301 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN visible:NO]; | 303 [self addColumnWithId:IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN visible:NO]; |
| 302 [self addColumnWithId:IDS_TASK_MANAGER_FPS_COLUMN visible:YES]; | 304 [self addColumnWithId:IDS_TASK_MANAGER_FPS_COLUMN visible:YES]; |
| 303 [self addColumnWithId:IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN visible:NO]; | 305 [self addColumnWithId:IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN visible:NO]; |
| 304 [self addColumnWithId:IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN visible:NO]; | 306 [self addColumnWithId:IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN visible:NO]; |
| 305 [self addColumnWithId:IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN | 307 [self addColumnWithId:IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN |
| 306 visible:NO]; | 308 visible:NO]; |
| 309 [self addColumnWithId:IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN | |
| 310 visible:NO]; | |
| 307 [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO]; | 311 [self addColumnWithId:IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN visible:NO]; |
| 308 } | 312 } |
| 309 | 313 |
| 310 // Creates a context menu for the table header that allows the user to toggle | 314 // Creates a context menu for the table header that allows the user to toggle |
| 311 // which columns should be shown and which should be hidden (like e.g. | 315 // which columns should be shown and which should be hidden (like e.g. |
| 312 // Task Manager.app's table header context menu). | 316 // Task Manager.app's table header context menu). |
| 313 - (void)setUpTableHeaderContextMenu { | 317 - (void)setUpTableHeaderContextMenu { |
| 314 base::scoped_nsobject<NSMenu> contextMenu( | 318 base::scoped_nsobject<NSMenu> contextMenu( |
| 315 [[NSMenu alloc] initWithTitle:@"Task Manager context menu"]); | 319 [[NSMenu alloc] initWithTitle:@"Task Manager context menu"]); |
| 316 for (NSTableColumn* column in [tableView_ tableColumns]) { | 320 for (NSTableColumn* column in [tableView_ tableColumns]) { |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 539 | 543 |
| 540 namespace chrome { | 544 namespace chrome { |
| 541 | 545 |
| 542 // Declared in browser_dialogs.h. | 546 // Declared in browser_dialogs.h. |
| 543 void ShowTaskManager(Browser* browser) { | 547 void ShowTaskManager(Browser* browser) { |
| 544 TaskManagerMac::Show(); | 548 TaskManagerMac::Show(); |
| 545 } | 549 } |
| 546 | 550 |
| 547 } // namespace chrome | 551 } // namespace chrome |
| 548 | 552 |
| OLD | NEW |