chrome/browser/extensions/api/system_info/system_info_api.cc - Issue 15817008: Move systemInfo.cpu API out out experimental namespace.

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: chrome/browser/extensions/api/system_info/system_info_api.cc

Issue 15817008: Move systemInfo.cpu API out out experimental namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 7 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

« chrome/browser/extensions/activity_log/api_name_constants.h ('K') | « chrome/browser/extensions/activity_log/api_name_constants.h ('k') | chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h » ('j') | chrome/browser/extensions/api/system_info_cpu/system_info_cpu_api.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_info/system_info_api.cc

diff --git a/chrome/browser/extensions/api/system_info/system_info_api.cc b/chrome/browser/extensions/api/system_info/system_info_api.cc

index 0f2eb33a3fe0be1c606d4ad60d0a73d3adaa0cb6..c574ed817f3888e97116fe70484f4f2abbc1cac7 100644

--- a/chrome/browser/extensions/api/system_info/system_info_api.cc

+++ b/chrome/browser/extensions/api/system_info/system_info_api.cc

@@ -18,8 +18,8 @@

#include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h"

#include "chrome/browser/extensions/event_names.h"

#include "chrome/browser/extensions/event_router_forwarder.h"

-#include "chrome/common/extensions/api/experimental_system_info_cpu.h"

#include "chrome/common/extensions/api/experimental_system_info_storage.h"

+#include "chrome/common/extensions/api/system_info_cpu.h"

#include "ui/gfx/display_observer.h"

#if defined(USE_ASH)

@@ -29,7 +29,7 @@

namespace extensions {

-using api::experimental_system_info_cpu::CpuUpdateInfo;

+using api::system_info_cpu::CpuUpdateInfo;

using api::experimental_system_info_storage::StorageUnitInfo;

using api::experimental_system_info_storage::StorageUnitType;

using api::experimental_system_info_storage::StorageChangeInfo;

@@ -100,7 +100,7 @@ class SystemInfoEventRouter

// The callback for CPU sampling cycle. Called from FILE thread.

void OnNextCpuSampling(

- scoped_ptr<api::experimental_system_info_cpu::CpuUpdateInfo> info);

+ scoped_ptr<api::system_info_cpu::CpuUpdateInfo> info);

// Called to dispatch the systemInfo.display.onDisplayChanged event.

void OnDisplayChanged();