chrome/browser/extensions/api/system_info_memory/memory_info_provider.h - Issue 16256023: Move systemInfo.memory API out of 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_memory/memory_info_provider.h

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

Patch Set: Resolved merge conflict from new commits Created 7 years, 6 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 | « chrome/browser/extensions/activity_log/api_name_constants.h ('k') | chrome/browser/extensions/api/system_info_memory/memory_info_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_info_memory/memory_info_provider.h

diff --git a/chrome/browser/extensions/api/system_info_memory/memory_info_provider.h b/chrome/browser/extensions/api/system_info_memory/memory_info_provider.h

index 4a8690366a01ed7db7afa12357fb8cc47fb31236..589d3acf95769eaf5f1284d5171917c0b774c5e3 100644

--- a/chrome/browser/extensions/api/system_info_memory/memory_info_provider.h

+++ b/chrome/browser/extensions/api/system_info_memory/memory_info_provider.h

@@ -6,23 +6,23 @@

#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_MEMORY_MEMORY_INFO_PROVIDER_H_

#include "chrome/browser/extensions/api/system_info/system_info_provider.h"

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

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

namespace extensions {

class MemoryInfoProvider

: public SystemInfoProvider<

- api::experimental_system_info_memory::MemoryInfo> {

+ api::system_info_memory::MemoryInfo> {

public:

static MemoryInfoProvider* Get();

// Overriden from SystemInfoProvider<MemoryInfo>.

virtual bool QueryInfo(

- api::experimental_system_info_memory::MemoryInfo* info) OVERRIDE;

+ api::system_info_memory::MemoryInfo* info) OVERRIDE;

private:

friend class SystemInfoProvider<

- api::experimental_system_info_memory::MemoryInfo>;

+ api::system_info_memory::MemoryInfo>;

friend class MockMemoryInfoProviderImpl;

friend class TestMemoryInfoProvider;