Skip to content

Commit 22fc2ee

Browse files
bholtzbholtz
committed
Rolls chrome.dart up to chrome 51
Adds all new IDL/JSON for Chrome 51 Adds new APIs to the APIs registry Adds parser changes and small IDL tweaks The changes to IDL are minimal in order to get the codegen running Adds generated code Tweaks generated files to pass dartanalyzer and travis
1 parent 1ce114d commit 22fc2ee

File tree

166 files changed

+7404
-1813
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+7404
-1813
lines changed

‎app/demo/demo.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void handleI18NMessage() {
162162
}
163163

164164
void handleI18NLanguages() {
165-
chrome.i18n.getAcceptLanguages().then((List<String> list) {
165+
chrome.i18n.getAcceptLanguages().then((List<chrome.LanguageCode> list) {
166166
summary(list.join(', '));
167167
});
168168
}

‎app/test_app/src/test_i18n.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ void main() {
1818
expect(chrome.i18n.getMessage('not_found'), equals(''));
1919
});
2020
test('getAcceptLanguages', () {
21-
Future future = chrome.i18n.getAcceptLanguages().then((List<String> languages) {
21+
Future future = chrome.i18n.getAcceptLanguages()
22+
.then((List<chrome.LanguageCode> languages) {
2223
expect(languages, isList);
2324
expect(languages.length, greaterThan(0));
2425
});

‎idl/chrome/_api_features.json

Lines changed: 93 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
1+
// Copyright 2012 The Chromium Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

@@ -59,10 +59,6 @@
5959
"contexts": ["blessed_extension", "unblessed_extension", "content_script"],
6060
"matches": []
6161
},
62-
"app.getDetailsForFrame": {
63-
"contexts": ["blessed_extension", "unblessed_extension", "content_script"],
64-
"matches": []
65-
},
6662
"app.getIsInstalled": {
6763
"contexts": ["blessed_extension", "unblessed_extension", "content_script"],
6864
"matches": []
@@ -158,7 +154,13 @@
158154
"FA01E0B81978950F2BC5A50512FD769725F57510", // Beta
159155
"B11A93E7E5B541F8010245EBDE2C74647D6C14B9", // Canary
160156
"F155646B5D1CA545F7E1E4E20D573DFDD44C2540", // Google Cast Beta
161-
"16CA7A47AAE4BE49B1E75A6B960C3875E945B264" // Google Cast Stable
157+
"16CA7A47AAE4BE49B1E75A6B960C3875E945B264", // Google Cast Stable
158+
// The extensions below here only use openPopup on a user action,
159+
// so are safe, and can be removed when the whitelist on that
160+
// capability is lifted. See crbug.com/436489 for context.
161+
"A4577D8C2AF4CF26F40CBCA83FFA4251D6F6C8F8", // http://crbug.com/497301
162+
"A8208CCC87F8261AFAEB6B85D5E8D47372DDEA6B", // http://crbug.com/497301
163+
"EFCF5358672FEE04789FD2EC3638A67ADEDB6C8C" // http://crbug.com/514696
162164
],
163165
"contexts": ["blessed_extension"]
164166
}],
@@ -170,6 +172,11 @@
170172
"dependencies": ["permission:cast"],
171173
"contexts": ["blessed_extension"]
172174
},
175+
"cast.devicesPrivate": {
176+
"dependencies": ["permission:cast"],
177+
"contexts": ["blessed_extension"],
178+
"platforms": ["chromeos"]
179+
},
173180
"cast.streaming.rtpStream": {
174181
"dependencies": ["permission:cast.streaming"],
175182
"contexts": ["blessed_extension"]
@@ -186,6 +193,15 @@
186193
"dependencies": ["permission:cast.streaming"],
187194
"contexts": ["blessed_extension"]
188195
},
196+
"certificateProvider": {
197+
"dependencies": ["permission:certificateProvider"],
198+
"contexts": ["blessed_extension"]
199+
},
200+
"certificateProviderInternal": {
201+
"internal": true,
202+
"dependencies": ["permission:certificateProvider"],
203+
"contexts": ["blessed_extension"]
204+
},
189205
"chromeosInfoPrivate": {
190206
"dependencies": ["permission:chromeosInfoPrivate"],
191207
"contexts": ["blessed_extension"]
@@ -198,7 +214,11 @@
198214
"internal": true,
199215
"channel": "dev",
200216
"contexts": ["webui"],
201-
"matches": ["chrome://chrome-signin/*", "chrome://oobe/*"]
217+
"matches": [
218+
"chrome://chrome-signin/*",
219+
"chrome://media-router/*",
220+
"chrome://oobe/*"
221+
]
202222
}],
203223
"cloudPrintPrivate": {
204224
"dependencies": ["permission:cloudPrintPrivate"],
@@ -241,6 +261,17 @@
241261
"dependencies": ["permission:cryptotokenPrivate"],
242262
"contexts": ["blessed_extension"]
243263
},
264+
"dashboardPrivate": [{
265+
"channel": "stable",
266+
"contexts": ["blessed_web_page", "web_page"],
267+
"matches": ["https://chrome.google.com/*"]
268+
}, {
269+
"channel": "stable",
270+
"contexts": ["blessed_extension"],
271+
"whitelist": [
272+
"B44D08FD98F1523ED5837D78D0A606EA9D6206E5" // Web Store
273+
]
274+
}],
244275
"dataReductionProxy": {
245276
"dependencies": ["permission:dataReductionProxy"],
246277
"contexts": ["blessed_extension"]
@@ -265,7 +296,7 @@
265296
"F155646B5D1CA545F7E1E4E20D573DFDD44C2540", // Google Cast Beta
266297
"16CA7A47AAE4BE49B1E75A6B960C3875E945B264", // Google Cast Stable
267298
"C17CD9E6868D7B9C67926E0EC612EA25C768418F", // http://crbug.com/457908
268-
"EF2AB692559EA97C3BBDEA018A8C45F92457BD4E" // http://crbug.com/457908
299+
"226CF815E39A363090A1E547D53063472B8279FA" // http://crbug.com/574889
269300
],
270301
"contexts": ["blessed_extension"]
271302
}],
@@ -318,6 +349,10 @@
318349
"dependencies": ["permission:echoPrivate"],
319350
"contexts": ["blessed_extension"]
320351
},
352+
"enterprise.deviceAttributes": {
353+
"dependencies": ["permission:enterprise.deviceAttributes"],
354+
"contexts": ["blessed_extension"]
355+
},
321356
"enterprise.platformKeys": {
322357
"dependencies": ["permission:enterprise.platformKeys"],
323358
"contexts": ["blessed_extension"]
@@ -456,13 +491,14 @@
456491
"channel": "stable",
457492
"contexts": ["blessed_extension"],
458493
"whitelist": [
459-
// http://crbug.com/309737
460-
"nckgahadagoaajjgafhacjanaoiihapd",
461-
"ljclpkphhpbpinifbeabbhlfddcpfdde",
462-
"ppleadejekpmccmnpjdimmlfljlkdfej",
463-
"eggnbpckecmjlblplehfpjjdhhidfdoj",
464-
"jfjjdfefebklmdbmenmlehlopoocnoeh",
465-
"knipolnnllmklapflnccelgolnpehhpl"
494+
// http://crbug.com/309737.
495+
// Keep this list in sync with extensions_misc::kHangoutsExtensionIds.
496+
"nckgahadagoaajjgafhacjanaoiihapd", // Hangouts Production.
497+
"ljclpkphhpbpinifbeabbhlfddcpfdde", // Hangouts Debug.
498+
"ppleadejekpmccmnpjdimmlfljlkdfej", // Hangouts Alpha.
499+
"eggnbpckecmjlblplehfpjjdhhidfdoj", // Hangouts Beta.
500+
"jfjjdfefebklmdbmenmlehlopoocnoeh", // Hangouts Packaged App Debug.
501+
"knipolnnllmklapflnccelgolnpehhpl" // Hangouts Packaged App Prod.
466502
]
467503
},
468504
"history": {
@@ -511,6 +547,18 @@
511547
"dependencies": ["permission:gcm"],
512548
"contexts": ["blessed_extension"]
513549
},
550+
"languageSettingsPrivate": [{
551+
"dependencies": ["permission:languageSettingsPrivate"],
552+
"contexts": ["blessed_extension"]
553+
}, {
554+
"channel": "stable",
555+
"contexts": ["webui"],
556+
"matches": [
557+
"chrome://md-settings/*",
558+
"chrome://settings/*",
559+
"chrome://settings-frame/*"
560+
]
561+
}],
514562
"launcherPage": {
515563
"dependencies": ["manifest:launcher_page"],
516564
"contexts": ["blessed_extension"]
@@ -519,10 +567,6 @@
519567
"dependencies": ["permission:launcherSearchProvider"],
520568
"contexts": ["blessed_extension"]
521569
},
522-
"location": {
523-
"dependencies": ["permission:location"],
524-
"contexts": ["blessed_extension"]
525-
},
526570
"logPrivate": {
527571
"dependencies": ["permission:logPrivate"],
528572
"contexts": ["blessed_extension"]
@@ -546,10 +590,18 @@
546590
"dependencies": ["permission:mediaPlayerPrivate"],
547591
"contexts": ["blessed_extension"]
548592
},
549-
"metricsPrivate": {
593+
"metricsPrivate": [{
550594
"dependencies": ["permission:metricsPrivate"],
551595
"contexts": ["blessed_extension"]
552-
},
596+
}, {
597+
"channel": "trunk",
598+
"contexts": ["webui"],
599+
"matches": [
600+
"chrome://md-settings/*",
601+
"chrome://settings/*",
602+
"chrome://settings-frame/*"
603+
]
604+
}],
553605
"mdns": {
554606
"dependencies": ["permission:mdns"],
555607
"contexts": ["blessed_extension"]
@@ -618,10 +670,6 @@
618670
"dependencies": ["permission:preferencesPrivate"],
619671
"contexts": ["blessed_extension"]
620672
},
621-
"principalsPrivate": {
622-
"dependencies": ["permission:principalsPrivate"],
623-
"contexts": ["blessed_extension"]
624-
},
625673
"privacy": {
626674
"dependencies": ["permission:privacy"],
627675
"contexts": ["blessed_extension"]
@@ -639,26 +687,20 @@
639687
"extension_types": ["platform_app"],
640688
"contexts": ["blessed_extension"]
641689
},
642-
"readingListPrivate": {
643-
"dependencies": ["permission:readingListPrivate"],
644-
"contexts": ["blessed_extension"]
645-
},
646-
"rtcPrivate": {
647-
"dependencies": ["permission:rtcPrivate"],
648-
"contexts": ["blessed_extension"]
649-
},
650-
"searchEnginesPrivate": [{
651-
"dependencies": ["permission:searchEnginesPrivate"],
690+
"resourcesPrivate": [{
691+
"dependencies": ["permission:resourcesPrivate"],
652692
"contexts": ["blessed_extension"]
653693
}, {
654-
"channel": "trunk",
694+
"channel": "stable",
655695
"contexts": ["webui"],
656696
"matches": [
657-
"chrome://md-settings/*",
658-
"chrome://settings/*",
659-
"chrome://settings-frame/*"
697+
"chrome://print/*"
660698
]
661699
}],
700+
"rtcPrivate": {
701+
"dependencies": ["permission:rtcPrivate"],
702+
"contexts": ["blessed_extension"]
703+
},
662704
"sessions": {
663705
"dependencies": ["permission:sessions"],
664706
"contexts": ["blessed_extension"]
@@ -720,6 +762,18 @@
720762
"dependencies": ["permission:ttsEngine"],
721763
"contexts": ["blessed_extension"]
722764
},
765+
"usersPrivate": [{
766+
"dependencies": ["permission:usersPrivate"],
767+
"contexts": ["blessed_extension"]
768+
}, {
769+
"channel": "trunk",
770+
"contexts": ["webui"],
771+
"matches": [
772+
"chrome://md-settings/*",
773+
"chrome://settings/*",
774+
"chrome://settings-frame/*"
775+
]
776+
}],
723777
"virtualKeyboardPrivate": {
724778
"dependencies": ["permission:virtualKeyboardPrivate"],
725779
"contexts": ["blessed_extension"]

‎idl/chrome/_manifest_features.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"automation": [{
4646
"channel": "dev",
47-
"extension_types": ["extension", "legacy_packaged_app"]
47+
"extension_types": ["extension", "legacy_packaged_app", "platform_app"]
4848
}, {
4949
"channel": "stable",
5050
"extension_types": ["extension", "legacy_packaged_app"],
@@ -81,10 +81,6 @@
8181
"extension_types": ["extension", "platform_app"],
8282
"min_manifest_version": 2
8383
},
84-
"content_pack": {
85-
"channel": "dev",
86-
"extension_types": ["extension"]
87-
},
8884
"content_scripts": {
8985
"channel": "stable",
9086
"extension_types": ["extension", "legacy_packaged_app"]
@@ -96,6 +92,13 @@
9692
],
9793
"no_doc": true
9894
},
95+
"event_rules": {
96+
"channel": "stable",
97+
// "event_rules" does not grant any capabilities, it's just
98+
// an optimisation for any API which uses events, so it's safe
99+
// to expose to all extension types.
100+
"extension_types": "all"
101+
},
99102
"devtools_page": {
100103
"channel": "stable",
101104
"extension_types": ["extension", "legacy_packaged_app"]

0 commit comments

Comments
 (0)