extensions/browser/api/system_cpu/cpu_info_provider_mac.cc - Issue 389633002: Move system.* family of APIs to extensions/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/api/system_cpu/cpu_info_provider_mac.cc

Issue 389633002: Move system.* family of APIs to extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: No ash/ dependency anymore Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/browser/api/system_cpu/cpu_info_provider_linux.cc ('k') | extensions/browser/api/system_cpu/cpu_info_provider_win.cc » ('j') | extensions/browser/api/system_memory/memory_info_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/system_cpu/cpu_info_provider_mac.cc

diff --git a/chrome/browser/extensions/api/system_cpu/cpu_info_provider_mac.cc b/extensions/browser/api/system_cpu/cpu_info_provider_mac.cc

similarity index 75%

rename from chrome/browser/extensions/api/system_cpu/cpu_info_provider_mac.cc

rename to extensions/browser/api/system_cpu/cpu_info_provider_mac.cc

index f1c6a8e3619ad79b65ec0ba277e61c41aed5a38e..52b427723278c700359ae79965a7c342f81df298 100644

--- a/chrome/browser/extensions/api/system_cpu/cpu_info_provider_mac.cc

+++ b/extensions/browser/api/system_cpu/cpu_info_provider_mac.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/extensions/api/system_cpu/cpu_info_provider.h"

+#include "extensions/browser/api/system_cpu/cpu_info_provider.h"

#include <mach/mach_host.h>

@@ -12,7 +12,7 @@

namespace extensions {

bool CpuInfoProvider::QueryCpuTimePerProcessor(

- std::vector<linked_ptr<api::system_cpu::ProcessorInfo> >* infos) {

+ std::vector<linked_ptr<core_api::system_cpu::ProcessorInfo> >* infos) {

DCHECK(infos);

natural_t num_of_processors;

@@ -26,14 +26,15 @@ bool CpuInfoProvider::QueryCpuTimePerProcessor(

reinterpret_cast<processor_info_array_t*>(&cpu_infos),

&type) == KERN_SUCCESS) {

DCHECK_EQ(num_of_processors,

- static_cast<natural_t>(base::SysInfo::NumberOfProcessors()));

+ static_cast<natural_t>(base::SysInfo::NumberOfProcessors()));

DCHECK_EQ(num_of_processors, static_cast<natural_t>(infos->size()));

for (natural_t i = 0; i < num_of_processors; ++i) {

double user = static_cast<double>(cpu_infos[i].cpu_ticks[CPU_STATE_USER]),

- sys = static_cast<double>(cpu_infos[i].cpu_ticks[CPU_STATE_SYSTEM]),

- nice = static_cast<double>(cpu_infos[i].cpu_ticks[CPU_STATE_NICE]),

- idle = static_cast<double>(cpu_infos[i].cpu_ticks[CPU_STATE_IDLE]);

+ sys =

+ static_cast<double>(cpu_infos[i].cpu_ticks[CPU_STATE_SYSTEM]),

+ nice = static_cast<double>(cpu_infos[i].cpu_ticks[CPU_STATE_NICE]),

+ idle = static_cast<double>(cpu_infos[i].cpu_ticks[CPU_STATE_IDLE]);

infos->at(i)->usage.kernel = sys;

infos->at(i)->usage.user = user + nice;