chrome/browser/ui/task_manager/task_manager_columns.cc - Issue 2178733002: Task manager should support Idle Wakeups on Windows

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: Fixed build error on win_clang. 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

« chrome/browser/task_management/task_manager_browsertest.cc ('K') | « chrome/browser/task_manager/legacy_task_manager_tester.cc ('k') | chrome/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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	74

75 #if defined(OS_MACOSX) \|\| defined(OS_LINUX)	75 #if defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_WIN)
	ncarter (slow) 2016/07/28 21:37:27 I think this is all platforms now, so we can just I think this is all platforms now, so we can just remove the #ifdef? (the only missing platform is android, where the task manager isn't compiled) stanisc 2016/07/28 22:38:44 I was wondering that but wasn't sure if this now c Show quoted text On 2016/07/28 21:37:27, ncarter wrote: > I think this is all platforms now, so we can just remove the #ifdef? > > (the only missing platform is android, where the task manager isn't compiled) I was wondering that but wasn't sure if this now cover all platforms. Will fix this. stanisc 2016/08/01 22:34:27 Done. Show quoted text On 2016/07/28 22:38:44, stanisc wrote: > On 2016/07/28 21:37:27, ncarter wrote: > > I think this is all platforms now, so we can just remove the #ifdef? > > > > (the only missing platform is android, where the task manager isn't compiled) > > I was wondering that but wasn't sure if this now cover all platforms. Will fix > this. Done.
76 // TODO(port): Port the idle wakeups per second to platforms other than Linux	76 // TODO(port): Port the idle wakeups per second to platforms other than Linux

77 // and MacOS (http://crbug.com/120488).	77 // and MacOS (http://crbug.com/120488).

78 { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0,	78 { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0,

79 arraysize("idlewakeups") * kCharWidth, -1, true, false, false },	79 arraysize("idlewakeups") * kCharWidth, -1, true, false, false },

80 #endif // defined(OS_MACOSX) \|\| defined(OS_LINUX)	80 #endif // defined(OS_MACOSX) \|\| defined(OS_LINUX)

81	81

82 #if defined(OS_LINUX)	82 #if defined(OS_LINUX)

83 { IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,	83 { IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,

84 arraysize("999") * kCharWidth, -1, true, false, false },	84 arraysize("999") * kCharWidth, -1, true, false, false },

85 #endif // defined(OS_LINUX)	85 #endif // defined(OS_LINUX)

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
129 switch (column_id) {	129 switch (column_id) {

130 COLUMNS_LITS(COLUMN_ID_AS_STRING)	130 COLUMNS_LITS(COLUMN_ID_AS_STRING)

131 default:	131 default:

132 NOTREACHED();	132 NOTREACHED();

133 return std::string();	133 return std::string();

134 }	134 }

135 }	135 }

136	136

137	137

138 } // namespace task_management	138 } // namespace task_management

OLD	NEW