Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Side by Side Diff: chrome/common/extensions/api/_manifest_features.json

Issue 44553002: Enabling Commands API for Apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable .global on stable Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // See c/c/e/features/* to understand this file, in particular feature.h, 5 // See c/c/e/features/* to understand this file, in particular feature.h,
6 // simple_feature.h, and base_feature_provider.h. 6 // simple_feature.h, and base_feature_provider.h.
7 7
8 { 8 {
9 "app": { 9 "app": {
10 "channel": "stable", 10 "channel": "stable",
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 "extension_types": ["extension"] 72 "extension_types": ["extension"]
73 }, 73 },
74 "chrome_settings_overrides": { 74 "chrome_settings_overrides": {
75 "channel": "dev", 75 "channel": "dev",
76 "extension_types": ["extension"] 76 "extension_types": ["extension"]
77 }, 77 },
78 "chrome_url_overrides": { 78 "chrome_url_overrides": {
79 "channel": "stable", 79 "channel": "stable",
80 "extension_types": ["extension", "legacy_packaged_app"] 80 "extension_types": ["extension", "legacy_packaged_app"]
81 }, 81 },
82 "commands": { 82 "commands": [
83 "channel": "stable", 83 {
84 "extension_types": ["extension"], 84 "channel": "dev",
85 "min_manifest_version": 2 85 "extension_types": ["extension", "platform_app"],
not at google - send to devlin 2013/10/28 16:17:22 You shouldn't need the "extension" here. These lis
Finnur 2013/10/28 16:34:24 Changed. To be clear -- because "extension" featu
not at google - send to devlin 2013/10/28 16:41:32 Yes exactly.
86 }, 86 "min_manifest_version": 2
87 "commands.global": { 87 }, {
88 "channel": "dev", 88 "channel": "stable",
89 "extension_types": ["extension"], 89 "extension_types": ["extension"],
90 "min_manifest_version": 2 90 "min_manifest_version": 2
91 }, 91 }
92 ],
93 "commands.global": [
94 {
95 "channel": "dev",
96 "extension_types": ["extension", "platform_app"],
97 "min_manifest_version": 2
98 }, {
99 "channel": "stable",
100 "extension_types": [],
101 "min_manifest_version": 2
not at google - send to devlin 2013/10/28 16:17:22 So you need this rule to balance the one above for
Finnur 2013/10/28 16:34:24 Yes. This makes the CHECK go away.
not at google - send to devlin 2013/10/28 16:41:32 Huh. Which CHECK?
102 }
103 ],
92 "content_pack": { 104 "content_pack": {
93 "channel": "dev", 105 "channel": "dev",
94 "extension_types": ["extension"] 106 "extension_types": ["extension"]
95 }, 107 },
96 "content_security_policy": { 108 "content_security_policy": {
97 "channel": "stable", 109 "channel": "stable",
98 // Platform apps have a restricted content security policy that cannot be 110 // Platform apps have a restricted content security policy that cannot be
99 // overriden (except for a whitelist of exceptions, see the 111 // overriden (except for a whitelist of exceptions, see the
100 // app.content_security_policy whitelist). 112 // app.content_security_policy whitelist).
101 "extension_types": ["extension", "legacy_packaged_app"] 113 "extension_types": ["extension", "legacy_packaged_app"]
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 "extension_types": [ 406 "extension_types": [
395 "extension", "legacy_packaged_app", "hosted_app" 407 "extension", "legacy_packaged_app", "hosted_app"
396 ] 408 ]
397 }, 409 },
398 "webview": { 410 "webview": {
399 "channel": "dev", 411 "channel": "dev",
400 "extension_types": ["platform_app"], 412 "extension_types": ["platform_app"],
401 "min_manifest_version": 2 413 "min_manifest_version": 2
402 } 414 }
403 } 415 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698