Chromium Code Reviews| Index: chrome/browser/ui/task_manager/task_manager_table_model.cc |
| diff --git a/chrome/browser/ui/task_manager/task_manager_table_model.cc b/chrome/browser/ui/task_manager/task_manager_table_model.cc |
| index e4d4ae2f10b95c38dd76e4e0e1750cfc09361e8e..456fc2c8995bc6ba01c1d07f888900dd0b78bef6 100644 |
| --- a/chrome/browser/ui/task_manager/task_manager_table_model.cc |
| +++ b/chrome/browser/ui/task_manager/task_manager_table_model.cc |
| @@ -63,6 +63,7 @@ bool IsSharedByGroup(int column_id) { |
| case IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN: |
| case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: |
| case IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN: |
| + case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: |
| return true; |
| default: |
| return false; |
| @@ -143,6 +144,13 @@ class TaskManagerValuesStringifier { |
| return memory_text; |
| } |
| + base::string16 GetMemoryStateText(base::MemoryState state) { |
| + if (state == base::MemoryState::UNKNOWN) |
| + return n_a_string_; |
| + // TODO(bashi): i18n. |
|
afakhry
2017/01/05 00:57:30
Nit: This TODO is very vague. Can you please expla
bashi
2017/01/05 01:05:52
Done.
afakhry
2017/01/05 01:27:10
In this case it's quite simple to do here. Conside
bashi
2017/01/05 02:18:22
Thanks for the suggestion. The MemoryState enums a
afakhry
2017/01/05 17:00:20
Perfect, thanks!
|
| + return base::UTF8ToUTF16(base::MemoryStateToString(state)); |
| + } |
| + |
| base::string16 GetIdleWakeupsText(int idle_wakeups) { |
| if (idle_wakeups == -1) |
| return n_a_string_; |
| @@ -398,6 +406,11 @@ base::string16 TaskManagerTableModel::GetText(int row, int column) { |
| } |
| #endif // defined(OS_LINUX) |
| + case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: { |
| + return stringifier_->GetMemoryStateText( |
| + observed_task_manager()->GetMemoryState(tasks_[row])); |
| + } |
| + |
| default: |
| NOTREACHED(); |
| return base::string16(); |
| @@ -419,6 +432,7 @@ int TaskManagerTableModel::CompareValues(int row1, |
| switch (column_id) { |
| case IDS_TASK_MANAGER_TASK_COLUMN: |
| case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN: |
| + case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: |
| return ui::TableModel::CompareValues(row1, row2, column_id); |
| case IDS_TASK_MANAGER_NET_COLUMN: |
| @@ -699,6 +713,10 @@ void TaskManagerTableModel::UpdateRefreshTypes(int column_id, bool visibility) { |
| type = REFRESH_TYPE_PRIORITY; |
| break; |
| + case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: |
| + type = REFRESH_TYPE_MEMORY_STATE; |
| + break; |
| + |
| #if defined(OS_LINUX) |
| case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: |
| type = REFRESH_TYPE_FD_COUNT; |