summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/api
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common/extensions/api')
-rw-r--r--chrome/common/extensions/api/_permission_features.json5
-rw-r--r--chrome/common/extensions/api/alarms.idl (renamed from chrome/common/extensions/api/experimental.alarms.idl)2
-rw-r--r--chrome/common/extensions/api/api.gyp2
3 files changed, 7 insertions, 2 deletions
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index 35d4080..ef72f19 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -3,6 +3,11 @@
// found in the LICENSE file.
{
+ "alarms": {
+ "channel": "dev",
+ "extension_types": ["extension", "packaged_app", "platform_app"],
+ "min_manifest_version": 2
+ },
"appNotifications": {
"channel": "stable",
"extension_types": ["packaged_app", "hosted_app"]
diff --git a/chrome/common/extensions/api/experimental.alarms.idl b/chrome/common/extensions/api/alarms.idl
index b3fdd1a..cd61d86 100644
--- a/chrome/common/extensions/api/experimental.alarms.idl
+++ b/chrome/common/extensions/api/alarms.idl
@@ -5,7 +5,7 @@
// File-level comment to appease parser. Eventually this will not be necessary.
// TODO(mpcomplete): We need documentation before we can release this.
-namespace experimental.alarms {
+namespace alarms {
dictionary Alarm {
// Name of this alarm.
DOMString name;
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index e5b1520..7134c98 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -28,7 +28,7 @@
'windows.json',
],
'idl_schema_files': [
- 'experimental.alarms.idl',
+ 'alarms.idl',
'experimental.bluetooth.idl',
'experimental.dns.idl',
'experimental.serial.idl',