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

Side by Side Diff: chrome/browser/ui/task_manager/task_manager_columns.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
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_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 13 matching lines...) Expand all
24 { IDS_TASK_MANAGER_TASK_COLUMN, ui::TableColumn::LEFT, -1, 1, 120, 600, true, 24 { IDS_TASK_MANAGER_TASK_COLUMN, ui::TableColumn::LEFT, -1, 1, 120, 600, true,
25 true, true }, 25 true, true },
26 { IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, ui::TableColumn::LEFT, -1, 0, 60, 200, 26 { IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, ui::TableColumn::LEFT, -1, 0, 60, 200,
27 true, true, false }, 27 true, true, false },
28 { IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0, 28 { IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
29 arraysize("800 MiB") * kCharWidth, -1, true, false, true }, 29 arraysize("800 MiB") * kCharWidth, -1, true, false, true },
30 { IDS_TASK_MANAGER_SHARED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0, 30 { IDS_TASK_MANAGER_SHARED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
31 arraysize("800 MiB") * kCharWidth, -1, true, false, false }, 31 arraysize("800 MiB") * kCharWidth, -1, true, false, false },
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
35 #if defined(OS_CHROMEOS)
36 { IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
37 arraysize("800 MiB") * kCharWidth, -1, true, false, false },
38 #endif
39
34 { IDS_TASK_MANAGER_CPU_COLUMN, ui::TableColumn::RIGHT, -1, 0, 40 { IDS_TASK_MANAGER_CPU_COLUMN, ui::TableColumn::RIGHT, -1, 0,
35 arraysize("99.9") * kCharWidth, -1, true, false, true }, 41 arraysize("99.9") * kCharWidth, -1, true, false, true },
36 { IDS_TASK_MANAGER_NET_COLUMN, ui::TableColumn::RIGHT, -1, 0, 42 { IDS_TASK_MANAGER_NET_COLUMN, ui::TableColumn::RIGHT, -1, 0,
37 arraysize("150 kiB/s") * kCharWidth, -1, true, false, true }, 43 arraysize("150 kiB/s") * kCharWidth, -1, true, false, true },
38 { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, ui::TableColumn::RIGHT, -1, 0, 44 { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, ui::TableColumn::RIGHT, -1, 0,
39 arraysize("73099 ") * kCharWidth, -1, true, true, true }, 45 arraysize("73099 ") * kCharWidth, -1, true, true, true },
40 46
41 #if defined(OS_WIN) 47 #if defined(OS_WIN)
42 { IDS_TASK_MANAGER_GDI_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0, 48 { IDS_TASK_MANAGER_GDI_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0,
43 true, false, false }, 49 true, false, false },
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 // they are generated. Instead we use the literal string value of the column 97 // they are generated. Instead we use the literal string value of the column
92 // ID symbol (i.e. for the ID IDS_TASK_MANAGER_TASK_COLUMN, we use the literal 98 // ID symbol (i.e. for the ID IDS_TASK_MANAGER_TASK_COLUMN, we use the literal
93 // string "IDS_TASK_MANAGER_TASK_COLUMN". The following macros help us 99 // string "IDS_TASK_MANAGER_TASK_COLUMN". The following macros help us
94 // efficiently get the literal ID for the integer value. 100 // efficiently get the literal ID for the integer value.
95 #define COLUMNS_LITS(def) \ 101 #define COLUMNS_LITS(def) \
96 def(IDS_TASK_MANAGER_TASK_COLUMN) \ 102 def(IDS_TASK_MANAGER_TASK_COLUMN) \
97 def(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN) \ 103 def(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN) \
98 def(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN) \ 104 def(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN) \
99 def(IDS_TASK_MANAGER_SHARED_MEM_COLUMN) \ 105 def(IDS_TASK_MANAGER_SHARED_MEM_COLUMN) \
100 def(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) \ 106 def(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) \
107 def(IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN) \
101 def(IDS_TASK_MANAGER_CPU_COLUMN) \ 108 def(IDS_TASK_MANAGER_CPU_COLUMN) \
102 def(IDS_TASK_MANAGER_NET_COLUMN) \ 109 def(IDS_TASK_MANAGER_NET_COLUMN) \
103 def(IDS_TASK_MANAGER_PROCESS_ID_COLUMN) \ 110 def(IDS_TASK_MANAGER_PROCESS_ID_COLUMN) \
104 def(IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) \ 111 def(IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) \
105 def(IDS_TASK_MANAGER_USER_HANDLES_COLUMN) \ 112 def(IDS_TASK_MANAGER_USER_HANDLES_COLUMN) \
106 def(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN) \ 113 def(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN) \
107 def(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN) \ 114 def(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN) \
108 def(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN) \ 115 def(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN) \
109 def(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN) \ 116 def(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN) \
110 def(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN) \ 117 def(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN) \
(...skipping 11 matching lines...) Expand all
122 switch (column_id) { 129 switch (column_id) {
123 COLUMNS_LITS(COLUMN_ID_AS_STRING) 130 COLUMNS_LITS(COLUMN_ID_AS_STRING)
124 default: 131 default:
125 NOTREACHED(); 132 NOTREACHED();
126 return std::string(); 133 return std::string();
127 } 134 }
128 } 135 }
129 136
130 137
131 } // namespace task_management 138 } // namespace task_management
OLDNEW
« no previous file with comments | « chrome/browser/task_management/test_task_manager.cc ('k') | chrome/browser/ui/task_manager/task_manager_table_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698