Add a "Keepalive count" column to Task Manager.

chrome/browser/ui/task_manager/task_manager_columns.cc

Index: chrome/browser/ui/task_manager/task_manager_columns.cc
diff --git a/chrome/browser/ui/task_manager/task_manager_columns.cc b/chrome/browser/ui/task_manager/task_manager_columns.cc
index d4ad52af38f5bf079191e7d8d577356eae096a1a..4c5333472b829069bd0b5073d8576d69dcc19991 100644
--- a/chrome/browser/ui/task_manager/task_manager_columns.cc
+++ b/chrome/browser/ui/task_manager/task_manager_columns.cc
@@ -21,73 +21,75 @@ const int kCharWidth = 6;
 // IMPORTANT: Do NOT change the below list without changing the COLUMN_LIST
 // macro below.
 const TableColumnData kColumns[] = {
-  { IDS_TASK_MANAGER_TASK_COLUMN, ui::TableColumn::LEFT, -1, 1, 120, 600, true,
-    true, true },
-  { IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, ui::TableColumn::LEFT, -1, 0, 60, 200,
-    true, true, false },
-  { IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("800 MiB") * kCharWidth, -1, true, false, true },
-  { IDS_TASK_MANAGER_SHARED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("800 MiB") * kCharWidth, -1, true, false, false },
-  { IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("800 MiB") * kCharWidth, -1, true, false, false },
+    {IDS_TASK_MANAGER_TASK_COLUMN, ui::TableColumn::LEFT, -1, 1, 120, 600, true,
+     true, true},
+    {IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, ui::TableColumn::LEFT, -1, 0, 60,
+     200, true, true, false},
+    {IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("800 MiB") * kCharWidth, -1, true, false, true},
+    {IDS_TASK_MANAGER_SHARED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("800 MiB") * kCharWidth, -1, true, false, false},
+    {IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("800 MiB") * kCharWidth, -1, true, false, false},
 
 #if defined(OS_CHROMEOS)
-  { IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("800 MiB") * kCharWidth, -1, true, false, false },
+    {IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("800 MiB") * kCharWidth, -1, true, false, false},
 #endif
 
-  { IDS_TASK_MANAGER_CPU_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("99.9") * kCharWidth, -1, true, false, true },
+    {IDS_TASK_MANAGER_CPU_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("99.9") * kCharWidth, -1, true, false, true},
 #if defined(OS_WIN)
-  { IDS_TASK_MANAGER_CPU_TIME_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("1234h 42m 30s") * kCharWidth, -1, true, false, false },
-  { IDS_TASK_MANAGER_START_TIME_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("12/13/14 11:44:30 PM") * kCharWidth, -1, true, true, false },
+    {IDS_TASK_MANAGER_CPU_TIME_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("1234h 42m 30s") * kCharWidth, -1, true, false, false},
+    {IDS_TASK_MANAGER_START_TIME_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("12/13/14 11:44:30 PM") * kCharWidth, -1, true, true, false},
 #endif
-  { IDS_TASK_MANAGER_NET_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("150 kiB/s") * kCharWidth, -1, true, false, true },
-  { IDS_TASK_MANAGER_PROCESS_ID_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("73099  ") * kCharWidth, -1, true, true, true },
+    {IDS_TASK_MANAGER_NET_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("150 kiB/s") * kCharWidth, -1, true, false, true},
+    {IDS_TASK_MANAGER_PROCESS_ID_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("73099  ") * kCharWidth, -1, true, true, true},
 
 #if defined(OS_WIN)
-  { IDS_TASK_MANAGER_GDI_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0,
-    true, false, false },
-  { IDS_TASK_MANAGER_USER_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0,
-    true, false, false },
+    {IDS_TASK_MANAGER_GDI_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0,
+     true, false, false},
+    {IDS_TASK_MANAGER_USER_HANDLES_COLUMN, ui::TableColumn::RIGHT, -1, 0, 0, 0,
+     true, false, false},
 #endif
 
-  { IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false, false },
-  { IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, ui::TableColumn::RIGHT, -1,
-    0, arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false,
-    false },
-  { IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false, false },
-  { IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("2000.0K") * kCharWidth, -1, true, false, false },
-  { IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("800 kB") * kCharWidth, -1, true, false, false },
+    {IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false, false},
+    {IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN, ui::TableColumn::RIGHT, -1,
+     0, arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false,
+     false},
+    {IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false, false},
+    {IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("2000.0K") * kCharWidth, -1, true, false, false},
+    {IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("800 kB") * kCharWidth, -1, true, false, false},
 
 #if !defined(DISABLE_NACL)
-  { IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("32767") * kCharWidth, -1, true, true, false },
+    {IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, ui::TableColumn::RIGHT, -1,
+     0, arraysize("32767") * kCharWidth, -1, true, true, false},
 #endif  // !defined(DISABLE_NACL)
 
-  { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, ui::TableColumn::RIGHT,
-    -1, 0, arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false,
-    false },
-  { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("idlewakeups") * kCharWidth, -1, true, false, false },
+    {IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN,
+     ui::TableColumn::RIGHT, -1, 0,
+     arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false, false},
+    {IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("idlewakeups") * kCharWidth, -1, true, false, false},
 
 #if defined(OS_LINUX)
-  { IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-    arraysize("999") * kCharWidth, -1, true, false, false },
+    {IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("999") * kCharWidth, -1, true, false, false},
 #endif  // defined(OS_LINUX)
-  { IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0,
-    arraysize("background") * kCharWidth, -1, true, true, false },
-  { IDS_TASK_MANAGER_MEMORY_STATE_COLUMN, ui::TableColumn::LEFT, -1, 0,
-    arraysize("throttled") * kCharWidth, -1, true, false, false },
+    {IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0,
+     arraysize("background") * kCharWidth, -1, true, true, false},
+    {IDS_TASK_MANAGER_MEMORY_STATE_COLUMN, ui::TableColumn::LEFT, -1, 0,
+     arraysize("throttled") * kCharWidth, -1, true, false, false},
+    {IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("999") * kCharWidth, -1, false, false, false},
 };
 
 const size_t kColumnsSize = arraysize(kColumns);
@@ -95,45 +97,43 @@ const size_t kColumnsSize = arraysize(kColumns);
 const char kSortColumnIdKey[] = "sort_column_id";
 const char kSortIsAscendingKey[] = "sort_is_ascending";
 
-// We can't use the integer IDs of the columns converted to strings as session
-// restore keys. These integer values can change from one build to another as
-// they are generated. Instead we use the literal string value of the column
-// ID symbol (i.e. for the ID IDS_TASK_MANAGER_TASK_COLUMN, we use the literal
-// string "IDS_TASK_MANAGER_TASK_COLUMN". The following macros help us
-// efficiently get the literal ID for the integer value.
-#define COLUMNS_LIST(def) \
-  def(IDS_TASK_MANAGER_TASK_COLUMN) \
-  def(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN) \
-  def(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN) \
-  def(IDS_TASK_MANAGER_SHARED_MEM_COLUMN) \
-  def(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) \
-  def(IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN) \
-  def(IDS_TASK_MANAGER_CPU_COLUMN) \
-  def(IDS_TASK_MANAGER_START_TIME_COLUMN) \
-  def(IDS_TASK_MANAGER_CPU_TIME_COLUMN) \
-  def(IDS_TASK_MANAGER_NET_COLUMN) \
-  def(IDS_TASK_MANAGER_PROCESS_ID_COLUMN) \
-  def(IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) \
-  def(IDS_TASK_MANAGER_USER_HANDLES_COLUMN) \
-  def(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN) \
-  def(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN) \
-  def(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN) \
-  def(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN) \
-  def(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN) \
-  def(IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN) \
-  def(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN) \
-  def(IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN) \
-  def(IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN) \
-  def(IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN) \
-  def(IDS_TASK_MANAGER_MEMORY_STATE_COLUMN)
-// Add to the above list in the macro any new IDs added in the future. Also
-// remove the removed ones.
-
-#define COLUMN_ID_AS_STRING(col_id) case col_id: return std::string(#col_id);
+// We can't derive session restore keys from the integer IDs of the columns
+// since the IDs are generated, and so may change from one build to another.
+// Instead we stringify the column ID symbol (i.e. for the ID
+// IDS_TASK_MANAGER_TASK_COLUMN, we use the literal string
+// "IDS_TASK_MANAGER_TASK_COLUMN").
+
+#define COLUMN_CASE(column_id) \
+  case column_id:              \
+    return std::string(#column_id);
 
 std::string GetColumnIdAsString(int column_id) {
   switch (column_id) {
-    COLUMNS_LIST(COLUMN_ID_AS_STRING)
+    COLUMN_CASE(IDS_TASK_MANAGER_TASK_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_SHARED_MEM_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_CPU_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_START_TIME_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_CPU_TIME_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_NET_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_PROCESS_ID_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_GDI_HANDLES_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_USER_HANDLES_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_MEMORY_STATE_COLUMN);
+    COLUMN_CASE(IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN);
     default:
       NOTREACHED();
       return std::string();