434a6e3561
* [ci skip] refactor: create request context from network context * [ci skip] refactor: subscribe to mojo cookiemanager for cookie changes * [ci skip] refactor: manage the lifetime of custom URLRequestJobFactory * refactor: use OOP mojo proxy resolver * revert: add support for kIgnoreCertificateErrorsSPKIList * build: provide service manifest overlays for content services * chore: gn format * fix: log-net-log switch not working as expected * spec: verify proxy settings are respected from pac script with session.setProxy * chore: use chrome constants where possible * fix: initialize request context for global cert fetcher * refactor: fix destruction of request context getters * spec: use custom session for proxy tests * fix: queue up additional stop callbacks while net log is being stopped * fix: Add CHECK for cookie manager retrieval * chore: add helper to retrieve logging state for net log module * fix: ui::ResourceBundle::GetRawDataResourceForScale => GetRawDataResource * style: comment unused parameters * build: move //components/certificate_transparency deps from //brightray * chore: update gritsettings_resource_ids patch * chore: update api for chromium 68 * fix: net log instance is now a property of session
15 lines
423 B
Diff
15 lines
423 B
Diff
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
|
|
index fc16a42e623e..8faa1363e177 100644
|
|
--- a/tools/gritsettings/resource_ids
|
|
+++ b/tools/gritsettings/resource_ids
|
|
@@ -407,6 +407,10 @@
|
|
"includes": [28900],
|
|
},
|
|
|
|
+ "electron/electron_resources.grd": {
|
|
+ "includes": [31750],
|
|
+ },
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|