chrome/common/extensions/permissions/chrome_api_permissions.cc - 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/chrome_api_permissions.cc

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/permissions/api_permission.h ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/chrome_api_permissions.cc

diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc

index 1ca88f6ea16568bb40810e55c2425b10fece92b7..d1b2f09c6613984a71a726936ee5d0466b29b4ce 100644

--- a/chrome/common/extensions/permissions/chrome_api_permissions.cc

+++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc

@@ -268,6 +268,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()

IDS_EXTENSION_PROMPT_WARNING_SYSTEM_INDICATOR,

PermissionMessage::kSystemIndicator },

{ APIPermission::kSystemInfoCpu, "systemInfo.cpu" },

+ { APIPermission::kSystemInfoMemory, "systemInfo.memory" },

{ APIPermission::kSystemInfoDisplay, "systemInfo.display" },

{ APIPermission::kPointerLock, "pointerLock" },

{ APIPermission::kFullscreen, "fullscreen" },