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

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

Issue 2653563003: Add a "Keepalive count" column to Task Manager. (Closed)
Patch Set: Address review comment re description Created 3 years, 10 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 IDS_TASK_MANAGER_CACHE_SIZE_CELL_TEXT, 227 IDS_TASK_MANAGER_CACHE_SIZE_CELL_TEXT,
228 ui::FormatBytesWithUnits(allocated, ui::DATA_UNITS_KIBIBYTE, false), 228 ui::FormatBytesWithUnits(allocated, ui::DATA_UNITS_KIBIBYTE, false),
229 ui::FormatBytesWithUnits(used, ui::DATA_UNITS_KIBIBYTE, false)); 229 ui::FormatBytesWithUnits(used, ui::DATA_UNITS_KIBIBYTE, false));
230 } 230 }
231 231
232 base::string16 GetWebCacheStatText( 232 base::string16 GetWebCacheStatText(
233 const blink::WebCache::ResourceTypeStat& stat) { 233 const blink::WebCache::ResourceTypeStat& stat) {
234 return GetMemoryUsageText(stat.size, false); 234 return GetMemoryUsageText(stat.size, false);
235 } 235 }
236 236
237 base::string16 GetKeepaliveCountText(int keepalive_count) const {
238 if (keepalive_count < 0)
239 return n_a_string();
240 return base::IntToString16(keepalive_count);
241 }
242
237 const base::string16& n_a_string() const { return n_a_string_; } 243 const base::string16& n_a_string() const { return n_a_string_; }
238 const base::string16& zero_string() const { return zero_string_; } 244 const base::string16& zero_string() const { return zero_string_; }
239 const base::string16& backgrounded_string() const { 245 const base::string16& backgrounded_string() const {
240 return backgrounded_string_; 246 return backgrounded_string_;
241 } 247 }
242 const base::string16& foregrounded_string() const { 248 const base::string16& foregrounded_string() const {
243 return foregrounded_string_; 249 return foregrounded_string_;
244 } 250 }
245 const base::string16& asterisk_string() const { return asterisk_string_; } 251 const base::string16& asterisk_string() const { return asterisk_string_; }
246 const base::string16& unknown_string() const { return unknown_string_; } 252 const base::string16& unknown_string() const { return unknown_string_; }
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 return fd_count >= 0 ? base::FormatNumber(fd_count) 455 return fd_count >= 0 ? base::FormatNumber(fd_count)
450 : stringifier_->n_a_string(); 456 : stringifier_->n_a_string();
451 } 457 }
452 #endif // defined(OS_LINUX) 458 #endif // defined(OS_LINUX)
453 459
454 case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: { 460 case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: {
455 return stringifier_->GetMemoryStateText( 461 return stringifier_->GetMemoryStateText(
456 observed_task_manager()->GetMemoryState(tasks_[row])); 462 observed_task_manager()->GetMemoryState(tasks_[row]));
457 } 463 }
458 464
465 case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: {
466 return stringifier_->GetKeepaliveCountText(
467 observed_task_manager()->GetKeepaliveCount(tasks_[row]));
468 }
469
459 default: 470 default:
460 NOTREACHED(); 471 NOTREACHED();
461 return base::string16(); 472 return base::string16();
462 } 473 }
463 } 474 }
464 475
465 gfx::ImageSkia TaskManagerTableModel::GetIcon(int row) { 476 gfx::ImageSkia TaskManagerTableModel::GetIcon(int row) {
466 return observed_task_manager()->GetIcon(tasks_[row]); 477 return observed_task_manager()->GetIcon(tasks_[row]);
467 } 478 }
468 479
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 break; 782 break;
772 783
773 case IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN: 784 case IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN:
774 type = REFRESH_TYPE_PRIORITY; 785 type = REFRESH_TYPE_PRIORITY;
775 break; 786 break;
776 787
777 case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: 788 case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN:
778 type = REFRESH_TYPE_MEMORY_STATE; 789 type = REFRESH_TYPE_MEMORY_STATE;
779 break; 790 break;
780 791
792 case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN:
793 type = REFRESH_TYPE_KEEPALIVE_COUNT;
794 break;
795
781 #if defined(OS_LINUX) 796 #if defined(OS_LINUX)
782 case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: 797 case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN:
783 type = REFRESH_TYPE_FD_COUNT; 798 type = REFRESH_TYPE_FD_COUNT;
784 break; 799 break;
785 #endif // defined(OS_LINUX) 800 #endif // defined(OS_LINUX)
786 801
787 default: 802 default:
788 NOTREACHED(); 803 NOTREACHED();
789 return; 804 return;
790 } 805 }
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 926
912 bool TaskManagerTableModel::IsTaskFirstInGroup(int row_index) const { 927 bool TaskManagerTableModel::IsTaskFirstInGroup(int row_index) const {
913 if (row_index == 0) 928 if (row_index == 0)
914 return true; 929 return true;
915 930
916 return observed_task_manager()->GetProcessId(tasks_[row_index - 1]) != 931 return observed_task_manager()->GetProcessId(tasks_[row_index - 1]) !=
917 observed_task_manager()->GetProcessId(tasks_[row_index]); 932 observed_task_manager()->GetProcessId(tasks_[row_index]);
918 } 933 }
919 934
920 } // namespace task_manager 935 } // namespace task_manager
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