summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorbenjhayden@chromium.org <benjhayden@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-17 16:03:52 +0000
committerbenjhayden@chromium.org <benjhayden@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-17 16:03:52 +0000
commitb39d56a733327e553437afe4c07da3b727769f0a (patch)
tree0f511c426971ac9c1ad053970efdcb36f49632d0 /extensions
parent8db095dd692b4b1a9a4c5f9c0414120a2531a9a8 (diff)
downloadchromium_src-b39d56a733327e553437afe4c07da3b727769f0a.zip
chromium_src-b39d56a733327e553437afe4c07da3b727769f0a.tar.gz
chromium_src-b39d56a733327e553437afe4c07da3b727769f0a.tar.bz2
The chrome.screenlockPrivate API allows select apps to control the ChromeOS ScreenLocker.
https://docs.google.com/document/d/1kSxngeyBPZIB7kK-QfDXgpzrDBvnVBcJfbK3HMFQIZg/edit The live version of the whitelisted app uses the chrome.usb API to execute a challenge-response protocol with an experimental device that has received a provisional green light from Google Security Team for unlocking. Review URL: https://codereview.chromium.org/60583003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/permissions/api_permission.h1
-rw-r--r--extensions/common/permissions/permission_message.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
index e748aab..b846077 100644
--- a/extensions/common/permissions/api_permission.h
+++ b/extensions/common/permissions/api_permission.h
@@ -161,6 +161,7 @@ class APIPermission {
kWebrtcLoggingPrivate,
kWebstorePrivate,
kWebView,
+ kScreenlockPrivate,
kSystemCpu,
kSystemMemory,
kSystemInfoCpu,
diff --git a/extensions/common/permissions/permission_message.h b/extensions/common/permissions/permission_message.h
index ecbd99a..82b5162 100644
--- a/extensions/common/permissions/permission_message.h
+++ b/extensions/common/permissions/permission_message.h
@@ -78,6 +78,7 @@ class PermissionMessage {
kSearchProvider,
kStartupPages,
kMediaGalleriesAllGalleriesDelete,
+ kScreenlockPrivate,
kEnumBoundary,
};
COMPILE_ASSERT(PermissionMessage::kNone > PermissionMessage::kUnknown,