chrome/common/extensions/permissions/api_permission.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/common/extensions/permissions/api_permission.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/common/extensions/docs/templates/public/apps/systemInfo_memory.html ('k') | chrome/common/extensions/permissions/chrome_api_permissions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/api_permission.h

diff --git a/chrome/common/extensions/permissions/api_permission.h b/chrome/common/extensions/permissions/api_permission.h

index 5e12d6c5782805e05b2c9933fee114409d5224b8..d237be15784387efaa1649a3d76eefbf2a29b5dd 100644

--- a/chrome/common/extensions/permissions/api_permission.h

+++ b/chrome/common/extensions/permissions/api_permission.h

@@ -133,6 +133,7 @@ class APIPermission {

kWebstorePrivate,

kWebView,

kSystemInfoCpu,

+ kSystemInfoMemory,

kEnumBoundary

};