Index: chrome/browser/task_manager/providers/child_process_task.cc |
diff --git a/chrome/browser/task_manager/providers/child_process_task.cc b/chrome/browser/task_manager/providers/child_process_task.cc |
index 5831758ab601eb3823c9dede546f4f8eb62ce4f1..f076482afd738f7ea747d727b0d19e9eaf847548 100644 |
--- a/chrome/browser/task_manager/providers/child_process_task.cc |
+++ b/chrome/browser/task_manager/providers/child_process_task.cc |
@@ -6,6 +6,7 @@ |
#include <utility> |
+#include "base/command_line.h" |
#include "base/i18n/rtl.h" |
#include "base/numerics/safe_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -13,6 +14,7 @@ |
#include "chrome/browser/process_resource_usage.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/task_manager/task_manager_observer.h" |
+#include "chrome/common/chrome_switches.h" |
#include "chrome/grit/generated_resources.h" |
#include "chrome/grit/theme_resources.h" |
#include "components/nacl/common/nacl_process_type.h" |
@@ -101,6 +103,10 @@ base::string16 GetLocalizedTitle(const base::string16& title, |
// These types don't need display names or get them from elsewhere. |
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.
|
case content::PROCESS_TYPE_RENDERER: |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ 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
|
+ 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.
|
+ } |
case content::PROCESS_TYPE_ZYGOTE: |
case content::PROCESS_TYPE_SANDBOX_HELPER: |
case content::PROCESS_TYPE_MAX: |
@@ -210,6 +216,8 @@ Task::Type ChildProcessTask::GetType() const { |
case PROCESS_TYPE_NACL_LOADER: |
case PROCESS_TYPE_NACL_BROKER: |
return Task::NACL; |
+ case content::PROCESS_TYPE_RENDERER: |
+ return Task::RENDERER; |
default: |
return Task::UNKNOWN; |
} |