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

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

Issue 2178733002: Task manager should support Idle Wakeups on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handling missing results in OnRefreshDone. Created 4 years, 4 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 arraysize("800 kB") * kCharWidth, -1, true, false, false }, 64 arraysize("800 kB") * kCharWidth, -1, true, false, false },
65 65
66 #if !defined(DISABLE_NACL) 66 #if !defined(DISABLE_NACL)
67 { IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, ui::TableColumn::RIGHT, -1, 0, 67 { IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
68 arraysize("32767") * kCharWidth, -1, true, true, false }, 68 arraysize("32767") * kCharWidth, -1, true, true, false },
69 #endif // !defined(DISABLE_NACL) 69 #endif // !defined(DISABLE_NACL)
70 70
71 { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, ui::TableColumn::RIGHT, 71 { IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, ui::TableColumn::RIGHT,
72 -1, 0, arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false, 72 -1, 0, arraysize("2000.0K (2000.0 live)") * kCharWidth, -1, true, false,
73 false }, 73 false },
74
75 #if defined(OS_MACOSX) || defined(OS_LINUX)
76 // TODO(port): Port the idle wakeups per second to platforms other than Linux
77 // and MacOS (http://crbug.com/120488).
brucedawson 2016/08/03 00:36:55 I think the #if needs to be retained, just modifie
stanisc 2016/08/03 01:39:43 Initially I retained this #if but Nick commented t
78 { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0, 74 { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0,
79 arraysize("idlewakeups") * kCharWidth, -1, true, false, false }, 75 arraysize("idlewakeups") * kCharWidth, -1, true, false, false },
80 #endif // defined(OS_MACOSX) || defined(OS_LINUX)
81 76
82 #if defined(OS_LINUX) 77 #if defined(OS_LINUX)
83 { IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, 78 { IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
84 arraysize("999") * kCharWidth, -1, true, false, false }, 79 arraysize("999") * kCharWidth, -1, true, false, false },
85 #endif // defined(OS_LINUX) 80 #endif // defined(OS_LINUX)
86 { IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0, 81 { IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0,
87 arraysize("background") * kCharWidth, -1, true, true, false }, 82 arraysize("background") * kCharWidth, -1, true, true, false },
88 }; 83 };
89 84
90 const size_t kColumnsSize = arraysize(kColumns); 85 const size_t kColumnsSize = arraysize(kColumns);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 switch (column_id) { 124 switch (column_id) {
130 COLUMNS_LITS(COLUMN_ID_AS_STRING) 125 COLUMNS_LITS(COLUMN_ID_AS_STRING)
131 default: 126 default:
132 NOTREACHED(); 127 NOTREACHED();
133 return std::string(); 128 return std::string();
134 } 129 }
135 } 130 }
136 131
137 132
138 } // namespace task_management 133 } // namespace task_management
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698