| OLD | NEW |
| 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_columns.h" | 5 #include "chrome/browser/ui/task_manager/task_manager_columns.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 { IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0, | 32 { IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0, |
| 33 arraysize("800 MiB") * kCharWidth, -1, true, false, false }, | 33 arraysize("800 MiB") * kCharWidth, -1, true, false, false }, |
| 34 | 34 |
| 35 #if defined(OS_CHROMEOS) | 35 #if defined(OS_CHROMEOS) |
| 36 { IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0, | 36 { IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0, |
| 37 arraysize("800 MiB") * kCharWidth, -1, true, false, false }, | 37 arraysize("800 MiB") * kCharWidth, -1, true, false, false }, |
| 38 #endif | 38 #endif |
| 39 | 39 |
| 40 { IDS_TASK_MANAGER_CPU_COLUMN, ui::TableColumn::RIGHT, -1, 0, | 40 { IDS_TASK_MANAGER_CPU_COLUMN, ui::TableColumn::RIGHT, -1, 0, |
| 41 arraysize("99.9") * kCharWidth, -1, true, false, true }, | 41 arraysize("99.9") * kCharWidth, -1, true, false, true }, |
| 42 #if defined(OS_WIN) |
| 43 { IDS_TASK_MANAGER_CPU_TIME_COLUMN, ui::TableColumn::RIGHT, -1, 0, |
| 44 arraysize("1234h 42m 30s") * kCharWidth, -1, true, false, false }, |
| 45 { IDS_TASK_MANAGER_START_TIME_COLUMN, ui::TableColumn::RIGHT, -1, 0, |
| 46 arraysize("12/13/14 11:44:30 PM") * kCharWidth, -1, true, true, false }, |
| 47 #endif |
| 42 { IDS_TASK_MANAGER_NET_COLUMN, ui::TableColumn::RIGHT, -1, 0, | 48 { IDS_TASK_MANAGER_NET_COLUMN, ui::TableColumn::RIGHT, -1, 0, |
| 43 arraysize("150 kiB/s") * kCharWidth, -1, true, false, true }, | 49 arraysize("150 kiB/s") * kCharWidth, -1, true, false, true }, |
| 44 { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, ui::TableColumn::RIGHT, -1, 0, | 50 { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, ui::TableColumn::RIGHT, -1, 0, |
| 45 arraysize("73099 ") * kCharWidth, -1, true, true, true }, | 51 arraysize("73099 ") * kCharWidth, -1, true, true, true }, |
| 46 | 52 |
| 47 #if defined(OS_WIN) | 53 #if defined(OS_WIN) |
| 48 { IDS_TASK_MANAGER_GDI_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0, | 54 { IDS_TASK_MANAGER_GDI_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0, |
| 49 true, false, false }, | 55 true, false, false }, |
| 50 { IDS_TASK_MANAGER_USER_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0, | 56 { IDS_TASK_MANAGER_USER_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0, |
| 51 true, false, false }, | 57 true, false, false }, |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 // string "IDS_TASK_MANAGER_TASK_COLUMN". The following macros help us | 102 // string "IDS_TASK_MANAGER_TASK_COLUMN". The following macros help us |
| 97 // efficiently get the literal ID for the integer value. | 103 // efficiently get the literal ID for the integer value. |
| 98 #define COLUMNS_LIST(def) \ | 104 #define COLUMNS_LIST(def) \ |
| 99 def(IDS_TASK_MANAGER_TASK_COLUMN) \ | 105 def(IDS_TASK_MANAGER_TASK_COLUMN) \ |
| 100 def(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN) \ | 106 def(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN) \ |
| 101 def(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN) \ | 107 def(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN) \ |
| 102 def(IDS_TASK_MANAGER_SHARED_MEM_COLUMN) \ | 108 def(IDS_TASK_MANAGER_SHARED_MEM_COLUMN) \ |
| 103 def(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) \ | 109 def(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) \ |
| 104 def(IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN) \ | 110 def(IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN) \ |
| 105 def(IDS_TASK_MANAGER_CPU_COLUMN) \ | 111 def(IDS_TASK_MANAGER_CPU_COLUMN) \ |
| 112 def(IDS_TASK_MANAGER_START_TIME_COLUMN) \ |
| 113 def(IDS_TASK_MANAGER_CPU_TIME_COLUMN) \ |
| 106 def(IDS_TASK_MANAGER_NET_COLUMN) \ | 114 def(IDS_TASK_MANAGER_NET_COLUMN) \ |
| 107 def(IDS_TASK_MANAGER_PROCESS_ID_COLUMN) \ | 115 def(IDS_TASK_MANAGER_PROCESS_ID_COLUMN) \ |
| 108 def(IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) \ | 116 def(IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) \ |
| 109 def(IDS_TASK_MANAGER_USER_HANDLES_COLUMN) \ | 117 def(IDS_TASK_MANAGER_USER_HANDLES_COLUMN) \ |
| 110 def(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN) \ | 118 def(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN) \ |
| 111 def(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN) \ | 119 def(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN) \ |
| 112 def(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN) \ | 120 def(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN) \ |
| 113 def(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN) \ | 121 def(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN) \ |
| 114 def(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN) \ | 122 def(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN) \ |
| 115 def(IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN) \ | 123 def(IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN) \ |
| (...skipping 10 matching lines...) Expand all Loading... |
| 126 std::string GetColumnIdAsString(int column_id) { | 134 std::string GetColumnIdAsString(int column_id) { |
| 127 switch (column_id) { | 135 switch (column_id) { |
| 128 COLUMNS_LIST(COLUMN_ID_AS_STRING) | 136 COLUMNS_LIST(COLUMN_ID_AS_STRING) |
| 129 default: | 137 default: |
| 130 NOTREACHED(); | 138 NOTREACHED(); |
| 131 return std::string(); | 139 return std::string(); |
| 132 } | 140 } |
| 133 } | 141 } |
| 134 | 142 |
| 135 } // namespace task_manager | 143 } // namespace task_manager |
| OLD | NEW |