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/task_manager/providers/child_process_task.h" | 5 #include "chrome/browser/task_manager/providers/child_process_task.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | |
9 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
10 #include "base/numerics/safe_conversions.h" | 11 #include "base/numerics/safe_conversions.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
13 #include "chrome/browser/process_resource_usage.h" | 14 #include "chrome/browser/process_resource_usage.h" |
14 #include "chrome/browser/profiles/profile_manager.h" | 15 #include "chrome/browser/profiles/profile_manager.h" |
15 #include "chrome/browser/task_manager/task_manager_observer.h" | 16 #include "chrome/browser/task_manager/task_manager_observer.h" |
17 #include "chrome/common/chrome_switches.h" | |
16 #include "chrome/grit/generated_resources.h" | 18 #include "chrome/grit/generated_resources.h" |
17 #include "chrome/grit/theme_resources.h" | 19 #include "chrome/grit/theme_resources.h" |
18 #include "components/nacl/common/nacl_process_type.h" | 20 #include "components/nacl/common/nacl_process_type.h" |
19 #include "content/public/browser/browser_child_process_host.h" | 21 #include "content/public/browser/browser_child_process_host.h" |
20 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
21 #include "content/public/browser/child_process_data.h" | 23 #include "content/public/browser/child_process_data.h" |
22 #include "content/public/common/child_process_host.h" | 24 #include "content/public/common/child_process_host.h" |
23 #include "content/public/common/process_type.h" | 25 #include "content/public/common/process_type.h" |
24 #include "extensions/browser/extension_registry.h" | 26 #include "extensions/browser/extension_registry.h" |
25 #include "extensions/common/extension_set.h" | 27 #include "extensions/common/extension_set.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
92 if (extension) { | 94 if (extension) { |
93 result_title = base::UTF8ToUTF16(extension->name()); | 95 result_title = base::UTF8ToUTF16(extension->name()); |
94 break; | 96 break; |
95 } | 97 } |
96 } | 98 } |
97 } | 99 } |
98 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_NACL_PREFIX, | 100 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_NACL_PREFIX, |
99 result_title); | 101 result_title); |
100 } | 102 } |
101 // These types don't need display names or get them from elsewhere. | 103 // These types don't need display names or get them from elsewhere. |
102 case content::PROCESS_TYPE_BROWSER: | 104 case content::PROCESS_TYPE_BROWSER: |
ncarter (slow)
2017/07/26 21:22:34
The fallthrough behavior of 'case' labels means th
cburn
2017/07/27 19:28:29
It was not, fixed now.
| |
103 case content::PROCESS_TYPE_RENDERER: | 105 case content::PROCESS_TYPE_RENDERER: |
106 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
107 switches::kEnableAggressiveProcessTracking)) { | |
ncarter (slow)
2017/07/26 21:22:34
Is this code actually reachable without the comman
cburn
2017/07/27 19:28:29
As far as I can tell I don't think it is hit and i
| |
108 return base::ASCIIToUTF16("Render Process Host"); | |
ncarter (slow)
2017/07/26 21:22:34
Users will see this, so we will need to get this s
cburn
2017/07/27 19:28:29
Sounds good.
| |
109 } | |
104 case content::PROCESS_TYPE_ZYGOTE: | 110 case content::PROCESS_TYPE_ZYGOTE: |
105 case content::PROCESS_TYPE_SANDBOX_HELPER: | 111 case content::PROCESS_TYPE_SANDBOX_HELPER: |
106 case content::PROCESS_TYPE_MAX: | 112 case content::PROCESS_TYPE_MAX: |
107 break; | 113 break; |
108 case content::PROCESS_TYPE_UNKNOWN: | 114 case content::PROCESS_TYPE_UNKNOWN: |
109 NOTREACHED() << "Need localized name for child process type."; | 115 NOTREACHED() << "Need localized name for child process type."; |
110 } | 116 } |
111 | 117 |
112 return result_title; | 118 return result_title; |
113 } | 119 } |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
203 return Task::UTILITY; | 209 return Task::UTILITY; |
204 case content::PROCESS_TYPE_ZYGOTE: | 210 case content::PROCESS_TYPE_ZYGOTE: |
205 return Task::ZYGOTE; | 211 return Task::ZYGOTE; |
206 case content::PROCESS_TYPE_SANDBOX_HELPER: | 212 case content::PROCESS_TYPE_SANDBOX_HELPER: |
207 return Task::SANDBOX_HELPER; | 213 return Task::SANDBOX_HELPER; |
208 case content::PROCESS_TYPE_GPU: | 214 case content::PROCESS_TYPE_GPU: |
209 return Task::GPU; | 215 return Task::GPU; |
210 case PROCESS_TYPE_NACL_LOADER: | 216 case PROCESS_TYPE_NACL_LOADER: |
211 case PROCESS_TYPE_NACL_BROKER: | 217 case PROCESS_TYPE_NACL_BROKER: |
212 return Task::NACL; | 218 return Task::NACL; |
219 case content::PROCESS_TYPE_RENDERER: | |
220 return Task::RENDERER; | |
213 default: | 221 default: |
214 return Task::UNKNOWN; | 222 return Task::UNKNOWN; |
215 } | 223 } |
216 } | 224 } |
217 | 225 |
218 int ChildProcessTask::GetChildProcessUniqueID() const { | 226 int ChildProcessTask::GetChildProcessUniqueID() const { |
219 return unique_child_process_id_; | 227 return unique_child_process_id_; |
220 } | 228 } |
221 | 229 |
222 bool ChildProcessTask::ReportsV8Memory() const { | 230 bool ChildProcessTask::ReportsV8Memory() const { |
223 return uses_v8_memory_ && process_resources_sampler_->ReportsV8MemoryStats(); | 231 return uses_v8_memory_ && process_resources_sampler_->ReportsV8MemoryStats(); |
224 } | 232 } |
225 | 233 |
226 int64_t ChildProcessTask::GetV8MemoryAllocated() const { | 234 int64_t ChildProcessTask::GetV8MemoryAllocated() const { |
227 return v8_memory_allocated_; | 235 return v8_memory_allocated_; |
228 } | 236 } |
229 | 237 |
230 int64_t ChildProcessTask::GetV8MemoryUsed() const { | 238 int64_t ChildProcessTask::GetV8MemoryUsed() const { |
231 return v8_memory_used_; | 239 return v8_memory_used_; |
232 } | 240 } |
233 | 241 |
234 } // namespace task_manager | 242 } // namespace task_manager |
OLD | NEW |