Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "activeTab": { | 9 "activeTab": { |
| 10 "channel": "stable", | 10 "channel": "stable", |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 128 "extension_types": ["extension", "packaged_app"] | 128 "extension_types": ["extension", "packaged_app"] |
| 129 }, | 129 }, |
| 130 "contextMenus": { | 130 "contextMenus": { |
| 131 "channel": "stable", | 131 "channel": "stable", |
| 132 "extension_types": ["extension", "packaged_app", "platform_app"] | 132 "extension_types": ["extension", "packaged_app", "platform_app"] |
| 133 }, | 133 }, |
| 134 "cookies": { | 134 "cookies": { |
| 135 "channel": "stable", | 135 "channel": "stable", |
| 136 "extension_types": ["extension", "packaged_app"] | 136 "extension_types": ["extension", "packaged_app"] |
| 137 }, | 137 }, |
| 138 "diagnostics": [{ | |
| 139 "channel": "dev", | |
| 140 "extension_types": ["platform_app"] | |
| 141 }, { | |
| 142 "channel": "stable", | |
| 143 "extension_types": ["platform_app"], | |
| 144 "whitelist": [ | |
| 145 "mlocfejafidcakdddnndjdngfmncfbeg", // CCD Development | |
| 146 "ganomidahfnpdchomfgdoppjmmedlhia", // CCD Testing | |
| 147 "eemlkeanncmjljgehlbplemhmdmalhdc" // CCD Release | |
| 148 ] | |
| 149 }], | |
|
xiaowenx
2013/06/20 19:42:44
White-spacing on this looks off.
asargent_no_longer_on_chrome
2013/06/20 22:51:29
Agreed - your lines 139-149 should be indented sim
Bei Zhang
2013/06/21 08:31:07
Done.
| |
| 138 "debugger": { | 150 "debugger": { |
| 139 "channel": "stable", | 151 "channel": "stable", |
| 140 "extension_types": ["extension", "packaged_app"] | 152 "extension_types": ["extension", "packaged_app"] |
| 141 }, | 153 }, |
| 142 "developerPrivate": { | 154 "developerPrivate": { |
| 143 "channel": "dev", | 155 "channel": "dev", |
| 144 "extension_types": ["platform_app"], | 156 "extension_types": ["platform_app"], |
| 145 "whitelist": [ | 157 "whitelist": [ |
| 146 "lphgohfeebnhcpiohjndkgbhhkoapkjc", // Apps Debugger | 158 "lphgohfeebnhcpiohjndkgbhhkoapkjc", // Apps Debugger |
| 147 "gonnpeheodhmhdjiimoiheniambmdcco", // Apps Editor old. | 159 "gonnpeheodhmhdjiimoiheniambmdcco", // Apps Editor old. |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 621 }, | 633 }, |
| 622 "webRequestBlocking": { | 634 "webRequestBlocking": { |
| 623 "channel": "stable", | 635 "channel": "stable", |
| 624 "extension_types": ["extension", "packaged_app"] | 636 "extension_types": ["extension", "packaged_app"] |
| 625 }, | 637 }, |
| 626 "webview": { | 638 "webview": { |
| 627 "channel": "stable", | 639 "channel": "stable", |
| 628 "extension_types": ["platform_app"] | 640 "extension_types": ["platform_app"] |
| 629 } | 641 } |
| 630 } | 642 } |
| OLD | NEW |