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_management/providers/child_process_task.h" | 5 #include "chrome/browser/task_management/providers/child_process_task.h" |
6 | 6 |
7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
8 #include "base/numerics/safe_conversions.h" | 8 #include "base/numerics/safe_conversions.h" |
| 9 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/process_resource_usage.h" | 10 #include "chrome/browser/process_resource_usage.h" |
10 #include "chrome/browser/task_management/task_manager_observer.h" | 11 #include "chrome/browser/task_management/task_manager_observer.h" |
11 #include "chrome/grit/generated_resources.h" | 12 #include "chrome/grit/generated_resources.h" |
12 #include "components/nacl/common/nacl_process_type.h" | 13 #include "components/nacl/common/nacl_process_type.h" |
13 #include "content/public/browser/browser_child_process_host.h" | 14 #include "content/public/browser/browser_child_process_host.h" |
14 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/browser/child_process_data.h" | 16 #include "content/public/browser/child_process_data.h" |
16 #include "content/public/common/process_type.h" | 17 #include "content/public/common/process_type.h" |
17 #include "content/public/common/service_registry.h" | 18 #include "content/public/common/service_registry.h" |
18 #include "grit/theme_resources.h" | 19 #include "grit/theme_resources.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 unique_child_process_id, | 125 unique_child_process_id, |
125 base::Passed(&usage_reporter))); | 126 base::Passed(&usage_reporter))); |
126 | 127 |
127 return new ProcessResourceUsage(service.Pass()); | 128 return new ProcessResourceUsage(service.Pass()); |
128 } | 129 } |
129 | 130 |
130 } // namespace | 131 } // namespace |
131 | 132 |
132 ChildProcessTask::ChildProcessTask(const content::ChildProcessData& data) | 133 ChildProcessTask::ChildProcessTask(const content::ChildProcessData& data) |
133 : Task(GetLocalizedTitle(data.name, data.process_type), | 134 : Task(GetLocalizedTitle(data.name, data.process_type), |
| 135 base::UTF16ToASCII(data.name), |
134 GetDefaultIcon(), | 136 GetDefaultIcon(), |
135 data.handle), | 137 data.handle), |
136 process_resources_sampler_(CreateProcessResourcesSampler(data.id)), | 138 process_resources_sampler_(CreateProcessResourcesSampler(data.id)), |
137 v8_memory_allocated_(-1), | 139 v8_memory_allocated_(-1), |
138 v8_memory_used_(-1), | 140 v8_memory_used_(-1), |
139 unique_child_process_id_(data.id), | 141 unique_child_process_id_(data.id), |
140 process_type_(data.process_type) { | 142 process_type_(data.process_type) { |
141 } | 143 } |
142 | 144 |
143 ChildProcessTask::~ChildProcessTask() { | 145 ChildProcessTask::~ChildProcessTask() { |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 | 197 |
196 int64 ChildProcessTask::GetV8MemoryAllocated() const { | 198 int64 ChildProcessTask::GetV8MemoryAllocated() const { |
197 return v8_memory_allocated_; | 199 return v8_memory_allocated_; |
198 } | 200 } |
199 | 201 |
200 int64 ChildProcessTask::GetV8MemoryUsed() const { | 202 int64 ChildProcessTask::GetV8MemoryUsed() const { |
201 return v8_memory_used_; | 203 return v8_memory_used_; |
202 } | 204 } |
203 | 205 |
204 } // namespace task_management | 206 } // namespace task_management |
OLD | NEW |