Chromium Code Reviews| Index: extensions/browser/api/system_memory/memory_info_provider.h |
| diff --git a/chrome/browser/extensions/api/system_memory/memory_info_provider.h b/extensions/browser/api/system_memory/memory_info_provider.h |
| similarity index 70% |
| rename from chrome/browser/extensions/api/system_memory/memory_info_provider.h |
| rename to extensions/browser/api/system_memory/memory_info_provider.h |
| index f83dd79f0a4e4964a69ea4cc257f4236935021b4..2c77097dd0f22b1142877f4c2b982b34ac36bc51 100644 |
| --- a/chrome/browser/extensions/api/system_memory/memory_info_provider.h |
| +++ b/extensions/browser/api/system_memory/memory_info_provider.h |
| @@ -2,12 +2,12 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_ |
| -#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_ |
| +#ifndef EXTENSIONS_BROWSER_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_ |
| +#define EXTENSIONS_BROWSER_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_ |
| #include "base/lazy_instance.h" |
| -#include "chrome/browser/extensions/api/system_info/system_info_provider.h" |
| -#include "chrome/common/extensions/api/system_memory.h" |
| +#include "extensions/browser/api/system_info/system_info_provider.h" |
| +#include "extensions/common/api/system_memory.h" |
| namespace extensions { |
| @@ -15,7 +15,7 @@ class MemoryInfoProvider : public SystemInfoProvider { |
| public: |
| static MemoryInfoProvider* Get(); |
| - const api::system_memory::MemoryInfo& memory_info() const; |
| + const core_api::system_memory::MemoryInfo& memory_info() const; |
|
Daniel Erat
2014/08/30 01:44:20
nit: inline simple accessors like this one
|
| static void InitializeForTesting(scoped_refptr<MemoryInfoProvider> provider); |
| @@ -35,7 +35,7 @@ class MemoryInfoProvider : public SystemInfoProvider { |
| // |info_| is accessed on the UI thread while |is_waiting_for_completion_| is |
| // false and on the sequenced worker pool while |is_waiting_for_completion_| |
| // is true. |
| - api::system_memory::MemoryInfo info_; |
| + core_api::system_memory::MemoryInfo info_; |
| static base::LazyInstance<scoped_refptr<MemoryInfoProvider> > provider_; |
| @@ -44,4 +44,4 @@ class MemoryInfoProvider : public SystemInfoProvider { |
| } // namespace extensions |
| -#endif // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_ |
| +#endif // EXTENSIONS_BROWSER_API_SYSTEM_MEMORY_MEMORY_INFO_PROVIDER_H_ |