diff options
author | tengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 08:42:30 +0000 |
---|---|---|
committer | tengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 08:42:30 +0000 |
commit | 14a18bf29f50bccceb3be7ba9aefb7b9ce5834c3 (patch) | |
tree | d40092078c383546966826641e24c4af5409991d /extensions | |
parent | dec3e9395662225cc8535562f55b401bcda4d26d (diff) | |
download | chromium_src-14a18bf29f50bccceb3be7ba9aefb7b9ce5834c3.zip chromium_src-14a18bf29f50bccceb3be7ba9aefb7b9ce5834c3.tar.gz chromium_src-14a18bf29f50bccceb3be7ba9aefb7b9ce5834c3.tar.bz2 |
Add "kiosk_only" manifest attribute for platform apps.
This top-level manifest attribute enforces that the app can only be installed and run in ChromeOS kiosk mode.
BUG=284964
TEST=added new tests
Review URL: https://codereview.chromium.org/23604068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/common/manifest_constants.cc | 6 | ||||
-rw-r--r-- | extensions/common/manifest_constants.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc index ec5a878..f4e00a6 100644 --- a/extensions/common/manifest_constants.cc +++ b/extensions/common/manifest_constants.cc @@ -57,6 +57,8 @@ const char kJs[] = "js"; const char kKey[] = "key"; const char kKeycode[] = "keyCode"; const char kKioskEnabled[] = "kiosk_enabled"; +const char kKioskOnly[] = "kiosk_only"; +const char kKioskMode[] = "kiosk_mode"; const char kLanguage[] = "language"; const char kLaunch[] = "app.launch"; const char kLaunchContainer[] = "app.launch.container"; @@ -416,6 +418,10 @@ const char kInvalidKeyBindingUnknownPlatform[] = " 'chromeos', 'linux' and 'default'."; const char kInvalidKioskEnabled[] = "Invalid value for 'kiosk_enabled'."; +const char kInvalidKioskOnly[] = + "Invalid value for 'kiosk_only'."; +const char kInvalidKioskOnlyButNotEnabled[] = + "The 'kiosk_only' key is set, but 'kiosk_enabled' is not set."; const char kInvalidLaunchContainer[] = "Invalid value for 'app.launch.container'."; const char kInvalidLaunchValue[] = diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h index 241387e..9f56879 100644 --- a/extensions/common/manifest_constants.h +++ b/extensions/common/manifest_constants.h @@ -66,6 +66,8 @@ extern const char kJs[]; extern const char kKey[]; extern const char kKeycode[]; extern const char kKioskEnabled[]; +extern const char kKioskOnly[]; +extern const char kKioskMode[]; extern const char kLanguage[]; extern const char kLaunch[]; extern const char kLaunchContainer[]; @@ -317,6 +319,8 @@ extern const char kInvalidKeyBindingMissingPlatform[]; extern const char kInvalidKeyBindingTooMany[]; extern const char kInvalidKeyBindingUnknownPlatform[]; extern const char kInvalidKioskEnabled[]; +extern const char kInvalidKioskOnly[]; +extern const char kInvalidKioskOnlyButNotEnabled[]; extern const char kInvalidLaunchContainer[]; extern const char kInvalidLaunchValue[]; extern const char kInvalidLaunchValueContainer[]; |