Chromium Code Reviews| Index: base/process/process_metrics.cc |
| diff --git a/base/process/process_metrics.cc b/base/process/process_metrics.cc |
| index e48633910763892ea1f64e54a7e0dea9acb1aca1..3b0d49eac4f2b119aa1bd3c190c1b07465d8ba40 100644 |
| --- a/base/process/process_metrics.cc |
| +++ b/base/process/process_metrics.cc |
| @@ -43,6 +43,14 @@ scoped_ptr<Value> SystemMetrics::ToValue() const { |
| return res.Pass(); |
| } |
| +ProcessMetrics* ProcessMetrics::CreateCurrentProcessMetrics() { |
| +#if !defined(OS_MACOSX) || defined(OS_IOS) |
| + return CreateProcessMetrics(base::GetCurrentProcessHandle()); |
| +#else |
| + return CreateProcessMetrics(base::GetCurrentProcessHandle(), NULL); |
|
Lei Zhang
2015/11/09 19:24:51
NULL -> nullptr in new code please.
fdoray
2015/11/10 19:30:27
Done.
|
| +#endif // !defined(OS_MACOSX) || defined(OS_IOS) |
| +} |
| + |
| double ProcessMetrics::GetPlatformIndependentCPUUsage() { |
| #if defined(OS_WIN) |
| return GetCPUUsage() * processor_count_; |