Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h

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
Index: chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h
diff --git a/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h b/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h
index 5adcc213a4d03cf2582e354e3fc8061a8b58520b..2f53ad6b955d7c443df1d88b705ccb51c9093ddc 100644
--- a/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h
+++ b/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h
@@ -8,7 +8,7 @@
#include "base/timer.h"
#include "chrome/browser/extensions/api/system_info/system_info_provider.h"
-#include "chrome/common/extensions/api/experimental_system_info_cpu.h"
+#include "chrome/common/extensions/api/system_info_cpu.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -16,15 +16,15 @@ namespace extensions {
class CpuInfoProvider
: public content::NotificationObserver,
- public SystemInfoProvider<api::experimental_system_info_cpu::CpuInfo> {
+ public SystemInfoProvider<api::system_info_cpu::CpuInfo> {
public:
typedef base::Callback<
- void(scoped_ptr<api::experimental_system_info_cpu::CpuUpdateInfo>)>
+ void(scoped_ptr<api::system_info_cpu::CpuUpdateInfo>)>
SamplingCallback;
// Overriden from SystemInfoProvider<CpuInfo>.
virtual bool QueryInfo(
- api::experimental_system_info_cpu::CpuInfo* info) OVERRIDE;
+ api::system_info_cpu::CpuInfo* info) OVERRIDE;
// Start sampling the CPU usage. The callback gets called when one sampling
// cycle is completed periodically with the CPU updated usage info for each
@@ -39,7 +39,7 @@ class CpuInfoProvider
static CpuInfoProvider* Get();
private:
- friend class SystemInfoProvider<api::experimental_system_info_cpu::CpuInfo>;
+ friend class SystemInfoProvider<api::system_info_cpu::CpuInfo>;
friend class MockCpuInfoProviderImpl;
friend class TestCpuInfoProvider;

Powered by Google App Engine
This is Rietveld 408576698