Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Side by Side Diff: chrome/browser/ui/task_manager/task_manager_table_model.cc

Issue 1845893002: [ChromeOS] Add Swapped Memory to TaskManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/task_manager/task_manager_columns.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/task_manager/task_manager_table_model.h" 5 #include "chrome/browser/ui/task_manager/task_manager_table_model.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 const char kCpuTextFormatString[] = "%.0f"; 45 const char kCpuTextFormatString[] = "%.0f";
46 #endif // defined(OS_MACOSX) 46 #endif // defined(OS_MACOSX)
47 47
48 // The columns that are shared by a group will show the value of the column 48 // The columns that are shared by a group will show the value of the column
49 // only once per group. 49 // only once per group.
50 bool IsSharedByGroup(int column_id) { 50 bool IsSharedByGroup(int column_id) {
51 switch (column_id) { 51 switch (column_id) {
52 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN: 52 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN:
53 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN: 53 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:
54 case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN: 54 case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN:
55 case IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN:
55 case IDS_TASK_MANAGER_CPU_COLUMN: 56 case IDS_TASK_MANAGER_CPU_COLUMN:
56 case IDS_TASK_MANAGER_NET_COLUMN: 57 case IDS_TASK_MANAGER_NET_COLUMN:
57 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN: 58 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:
58 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: 59 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN:
59 case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN: 60 case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN:
60 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: 61 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN:
61 case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN: 62 case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:
62 case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN: 63 case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN:
63 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: 64 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN:
64 case IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN: 65 case IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN:
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 observed_task_manager()->GetPrivateMemoryUsage(tasks_[row]), false); 306 observed_task_manager()->GetPrivateMemoryUsage(tasks_[row]), false);
306 307
307 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN: 308 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:
308 return stringifier_->GetMemoryUsageText( 309 return stringifier_->GetMemoryUsageText(
309 observed_task_manager()->GetSharedMemoryUsage(tasks_[row]), false); 310 observed_task_manager()->GetSharedMemoryUsage(tasks_[row]), false);
310 311
311 case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN: 312 case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN:
312 return stringifier_->GetMemoryUsageText( 313 return stringifier_->GetMemoryUsageText(
313 observed_task_manager()->GetPhysicalMemoryUsage(tasks_[row]), false); 314 observed_task_manager()->GetPhysicalMemoryUsage(tasks_[row]), false);
314 315
316 case IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN:
317 return stringifier_->GetMemoryUsageText(
318 observed_task_manager()->GetSwappedMemoryUsage(tasks_[row]), false);
319
315 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN: 320 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:
316 return stringifier_->GetProcessIdText( 321 return stringifier_->GetProcessIdText(
317 observed_task_manager()->GetProcessId(tasks_[row])); 322 observed_task_manager()->GetProcessId(tasks_[row]));
318 323
319 case IDS_TASK_MANAGER_GDI_HANDLES_COLUMN: { 324 case IDS_TASK_MANAGER_GDI_HANDLES_COLUMN: {
320 int64_t current, peak; 325 int64_t current, peak;
321 observed_task_manager()->GetGDIHandles(tasks_[row], &current, &peak); 326 observed_task_manager()->GetGDIHandles(tasks_[row], &current, &peak);
322 return stringifier_->GetWindowsHandlesText(current, peak); 327 return stringifier_->GetWindowsHandlesText(current, peak);
323 } 328 }
324 329
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN: 441 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:
437 return ValueCompare( 442 return ValueCompare(
438 observed_task_manager()->GetSharedMemoryUsage(tasks_[row1]), 443 observed_task_manager()->GetSharedMemoryUsage(tasks_[row1]),
439 observed_task_manager()->GetSharedMemoryUsage(tasks_[row2])); 444 observed_task_manager()->GetSharedMemoryUsage(tasks_[row2]));
440 445
441 case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN: 446 case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN:
442 return ValueCompare( 447 return ValueCompare(
443 observed_task_manager()->GetPhysicalMemoryUsage(tasks_[row1]), 448 observed_task_manager()->GetPhysicalMemoryUsage(tasks_[row1]),
444 observed_task_manager()->GetPhysicalMemoryUsage(tasks_[row2])); 449 observed_task_manager()->GetPhysicalMemoryUsage(tasks_[row2]));
445 450
451 case IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN:
452 return ValueCompare(
453 observed_task_manager()->GetSwappedMemoryUsage(tasks_[row1]),
454 observed_task_manager()->GetSwappedMemoryUsage(tasks_[row2]));
455
446 case IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN: 456 case IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN:
447 return ValueCompare( 457 return ValueCompare(
448 observed_task_manager()->GetNaClDebugStubPort(tasks_[row1]), 458 observed_task_manager()->GetNaClDebugStubPort(tasks_[row1]),
449 observed_task_manager()->GetNaClDebugStubPort(tasks_[row2])); 459 observed_task_manager()->GetNaClDebugStubPort(tasks_[row2]));
450 460
451 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN: 461 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:
452 return ValueCompare(observed_task_manager()->GetProcessId(tasks_[row1]), 462 return ValueCompare(observed_task_manager()->GetProcessId(tasks_[row1]),
453 observed_task_manager()->GetProcessId(tasks_[row2])); 463 observed_task_manager()->GetProcessId(tasks_[row2]));
454 464
455 case IDS_TASK_MANAGER_GDI_HANDLES_COLUMN: { 465 case IDS_TASK_MANAGER_GDI_HANDLES_COLUMN: {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 type = REFRESH_TYPE_NETWORK_USAGE; 617 type = REFRESH_TYPE_NETWORK_USAGE;
608 break; 618 break;
609 619
610 case IDS_TASK_MANAGER_CPU_COLUMN: 620 case IDS_TASK_MANAGER_CPU_COLUMN:
611 type = REFRESH_TYPE_CPU; 621 type = REFRESH_TYPE_CPU;
612 break; 622 break;
613 623
614 case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN: 624 case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN:
615 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN: 625 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN:
616 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN: 626 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:
627 case IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN:
617 type = REFRESH_TYPE_MEMORY; 628 type = REFRESH_TYPE_MEMORY;
618 if (table_view_delegate_->IsColumnVisible( 629 if (table_view_delegate_->IsColumnVisible(
619 IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN) || 630 IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN) ||
620 table_view_delegate_->IsColumnVisible( 631 table_view_delegate_->IsColumnVisible(
621 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) || 632 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) ||
622 table_view_delegate_->IsColumnVisible( 633 table_view_delegate_->IsColumnVisible(
623 IDS_TASK_MANAGER_SHARED_MEM_COLUMN)) { 634 IDS_TASK_MANAGER_SHARED_MEM_COLUMN) ||
635 table_view_delegate_->IsColumnVisible(
636 IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN)) {
624 new_visibility = true; 637 new_visibility = true;
625 } 638 }
626 break; 639 break;
627 640
628 case IDS_TASK_MANAGER_GDI_HANDLES_COLUMN: 641 case IDS_TASK_MANAGER_GDI_HANDLES_COLUMN:
629 case IDS_TASK_MANAGER_USER_HANDLES_COLUMN: 642 case IDS_TASK_MANAGER_USER_HANDLES_COLUMN:
630 type = REFRESH_TYPE_HANDLES; 643 type = REFRESH_TYPE_HANDLES;
631 if (table_view_delegate_->IsColumnVisible( 644 if (table_view_delegate_->IsColumnVisible(
632 IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) || 645 IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) ||
633 table_view_delegate_->IsColumnVisible( 646 table_view_delegate_->IsColumnVisible(
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 bool TaskManagerTableModel::IsTaskFirstInGroup(int row_index) const { 822 bool TaskManagerTableModel::IsTaskFirstInGroup(int row_index) const {
810 if (row_index == 0) 823 if (row_index == 0)
811 return true; 824 return true;
812 825
813 return observed_task_manager()->GetProcessId(tasks_[row_index - 1]) != 826 return observed_task_manager()->GetProcessId(tasks_[row_index - 1]) !=
814 observed_task_manager()->GetProcessId(tasks_[row_index]); 827 observed_task_manager()->GetProcessId(tasks_[row_index]);
815 } 828 }
816 829
817 830
818 } // namespace task_management 831 } // namespace task_management
OLDNEW
« no previous file with comments | « chrome/browser/ui/task_manager/task_manager_columns.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698