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

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

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 unified diff | Download patch
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 { 5 {
6 "activeTab": { 6 "activeTab": {
7 "channel": "stable", 7 "channel": "stable",
8 "extension_types": ["extension", "packaged_app"], 8 "extension_types": ["extension", "packaged_app"],
9 "min_manifest_version": 2 9 "min_manifest_version": 2
10 }, 10 },
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 "extension_types": ["extension", "packaged_app", "platform_app"], 485 "extension_types": ["extension", "packaged_app", "platform_app"],
486 "min_manifest_version": 2 486 "min_manifest_version": 2
487 }, 487 },
488 "systemInfo.cpu": { 488 "systemInfo.cpu": {
489 "channel": "dev", 489 "channel": "dev",
490 "extension_types": [ 490 "extension_types": [
491 "extension", "packaged_app", "hosted_app", "platform_app" 491 "extension", "packaged_app", "hosted_app", "platform_app"
492 ], 492 ],
493 "whitelist": [""] 493 "whitelist": [""]
494 }, 494 },
495 "systemInfo.memory": {
496 "channel": "dev",
497 "extension_types": [
498 "extension", "packaged_app", "hosted_app", "platform_app"
499 ],
500 "whitelist": [""]
501 },
495 "systemInfo.display": { 502 "systemInfo.display": {
496 "channel": "stable", 503 "channel": "stable",
497 "extension_types": ["extension", "packaged_app", "platform_app"] 504 "extension_types": ["extension", "packaged_app", "platform_app"]
498 }, 505 },
499 "systemPrivate": { 506 "systemPrivate": {
500 "channel": "stable", 507 "channel": "stable",
501 "extension_types": ["extension", "packaged_app"], 508 "extension_types": ["extension", "packaged_app"],
502 "location": "component" 509 "location": "component"
503 }, 510 },
504 "tabs": { 511 "tabs": {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 }, 598 },
592 "webRequestBlocking": { 599 "webRequestBlocking": {
593 "channel": "stable", 600 "channel": "stable",
594 "extension_types": ["extension", "packaged_app"] 601 "extension_types": ["extension", "packaged_app"]
595 }, 602 },
596 "webview": { 603 "webview": {
597 "channel": "stable", 604 "channel": "stable",
598 "extension_types": ["platform_app"] 605 "extension_types": ["platform_app"]
599 } 606 }
600 } 607 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_function_histogram_value.h ('k') | chrome/common/extensions/api/api.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698