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

Side by Side Diff: chrome/browser/task_manager/providers/child_process_task.cc

Issue 2988453002: Task manager tracking RenderProcessHosts processes (Closed)
Patch Set: fixed copy past cruft Created 3 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/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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 enabled_extensions.GetExtensionOrAppByURL(GURL(result_title)); 93 enabled_extensions.GetExtensionOrAppByURL(GURL(result_title));
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 }
103 case content::PROCESS_TYPE_RENDERER: {
104 // TODO: (cburn) Start the UI Localization process for this. Currently the
Charlie Reis 2017/08/02 18:39:14 nit: Slight syntax fix: TODO(cburn): Also, let'
cburn 2017/08/04 16:39:53 Done.
105 // best name for this is "Renderer".
106 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
107 switches::kTaskManagerShowExtraRenderers)) {
108 return base::ASCIIToUTF16("Renderer");
109 }
110 }
101 // These types don't need display names or get them from elsewhere. 111 // These types don't need display names or get them from elsewhere.
102 case content::PROCESS_TYPE_BROWSER: 112 case content::PROCESS_TYPE_BROWSER:
103 case content::PROCESS_TYPE_RENDERER:
104 case content::PROCESS_TYPE_ZYGOTE: 113 case content::PROCESS_TYPE_ZYGOTE:
105 case content::PROCESS_TYPE_SANDBOX_HELPER: 114 case content::PROCESS_TYPE_SANDBOX_HELPER:
106 case content::PROCESS_TYPE_MAX: 115 case content::PROCESS_TYPE_MAX:
107 break; 116 break;
108 case content::PROCESS_TYPE_UNKNOWN: 117 case content::PROCESS_TYPE_UNKNOWN:
109 NOTREACHED() << "Need localized name for child process type."; 118 NOTREACHED() << "Need localized name for child process type.";
110 } 119 }
111 120
112 return result_title; 121 return result_title;
113 } 122 }
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 return Task::UTILITY; 212 return Task::UTILITY;
204 case content::PROCESS_TYPE_ZYGOTE: 213 case content::PROCESS_TYPE_ZYGOTE:
205 return Task::ZYGOTE; 214 return Task::ZYGOTE;
206 case content::PROCESS_TYPE_SANDBOX_HELPER: 215 case content::PROCESS_TYPE_SANDBOX_HELPER:
207 return Task::SANDBOX_HELPER; 216 return Task::SANDBOX_HELPER;
208 case content::PROCESS_TYPE_GPU: 217 case content::PROCESS_TYPE_GPU:
209 return Task::GPU; 218 return Task::GPU;
210 case PROCESS_TYPE_NACL_LOADER: 219 case PROCESS_TYPE_NACL_LOADER:
211 case PROCESS_TYPE_NACL_BROKER: 220 case PROCESS_TYPE_NACL_BROKER:
212 return Task::NACL; 221 return Task::NACL;
222 case content::PROCESS_TYPE_RENDERER:
223 return Task::RENDERER;
213 default: 224 default:
214 return Task::UNKNOWN; 225 return Task::UNKNOWN;
215 } 226 }
216 } 227 }
217 228
218 int ChildProcessTask::GetChildProcessUniqueID() const { 229 int ChildProcessTask::GetChildProcessUniqueID() const {
219 return unique_child_process_id_; 230 return unique_child_process_id_;
220 } 231 }
221 232
222 bool ChildProcessTask::ReportsV8Memory() const { 233 bool ChildProcessTask::ReportsV8Memory() const {
223 return uses_v8_memory_ && process_resources_sampler_->ReportsV8MemoryStats(); 234 return uses_v8_memory_ && process_resources_sampler_->ReportsV8MemoryStats();
224 } 235 }
225 236
226 int64_t ChildProcessTask::GetV8MemoryAllocated() const { 237 int64_t ChildProcessTask::GetV8MemoryAllocated() const {
227 return v8_memory_allocated_; 238 return v8_memory_allocated_;
228 } 239 }
229 240
230 int64_t ChildProcessTask::GetV8MemoryUsed() const { 241 int64_t ChildProcessTask::GetV8MemoryUsed() const {
231 return v8_memory_used_; 242 return v8_memory_used_;
232 } 243 }
233 244
234 } // namespace task_manager 245 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698