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

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

Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/out/Debug
Patch Set: Updated to ToT and addressed Matt's comments in base-CL Created 9 years, 10 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 | Annotate | Revision Log
OLDNEW
1 [ 1 [
2 { 2 {
3 "namespace": "extension", 3 "namespace": "extension",
4 "unprivileged": true, 4 "unprivileged": true,
5 "types": [ 5 "types": [
6 { 6 {
7 "id": "MessageSender", 7 "id": "MessageSender",
8 "type": "object", 8 "type": "object",
9 "description": "An object containing information about the script contex t that sent a message or request.", 9 "description": "An object containing information about the script contex t that sent a message or request.",
10 "properties": { 10 "properties": {
(...skipping 3726 matching lines...) Expand 10 before | Expand all | Expand 10 after
3737 "description": "An object encapsulating a single proxy server's specific ation.", 3737 "description": "An object encapsulating a single proxy server's specific ation.",
3738 "properties": { 3738 "properties": {
3739 "scheme": {"type": "string", "optional": true, "enum": ["http", "socks ", "socks4", "socks5"], "description": "The scheme (protocol) of the proxy serve r itself."}, 3739 "scheme": {"type": "string", "optional": true, "enum": ["http", "socks ", "socks4", "socks5"], "description": "The scheme (protocol) of the proxy serve r itself."},
3740 "host": {"type": "string", "description": "The URI of the proxy server ."}, 3740 "host": {"type": "string", "description": "The URI of the proxy server ."},
3741 "port": {"type": "integer", "optional": true, "description": "The port of the proxy server."} 3741 "port": {"type": "integer", "optional": true, "description": "The port of the proxy server."}
3742 } 3742 }
3743 }, 3743 },
3744 { 3744 {
3745 "id": "ProxyRules", 3745 "id": "ProxyRules",
3746 "type": "object", 3746 "type": "object",
3747 "description": "An object encapsulating the set of proxy rules for all p rotocols.", 3747 "description": "An object encapsulating the set of proxy rules for all p rotocols. Use either 'singleProxy' or (a subset of) 'proxyForHttp', 'proxyForHtt ps', 'proxyForFtp' and 'socksProxy'.",
3748 "properties": { 3748 "properties": {
3749 "singleProxy": {"$ref": "ProxyServer", "optional": true, "description" : "The proxy server to be used for all per-URL requests (i.e., http, https, and ftp)."}, 3749 "singleProxy": {"$ref": "ProxyServer", "optional": true, "description" : "The proxy server to be used for all per-URL requests (i.e., http, https, and ftp)."},
3750 "proxyForHttp": {"$ref": "ProxyServer", "optional": true, "description ": "The proxy server to be used for HTTP requests."}, 3750 "proxyForHttp": {"$ref": "ProxyServer", "optional": true, "description ": "The proxy server to be used for HTTP requests."},
3751 "proxyForHttps": {"$ref": "ProxyServer", "optional": true, "descriptio n": "The proxy server to be used for HTTPS requests."}, 3751 "proxyForHttps": {"$ref": "ProxyServer", "optional": true, "descriptio n": "The proxy server to be used for HTTPS requests."},
3752 "proxyForFtp": {"$ref": "ProxyServer", "optional": true, "description" : "The proxy server to be used for FTP requests."}, 3752 "proxyForFtp": {"$ref": "ProxyServer", "optional": true, "description" : "The proxy server to be used for FTP requests."},
3753 "socksProxy": {"$ref": "ProxyServer", "optional": true, "description": "The proxy server to be used for SOCKS requests."} 3753 "socksProxy": {"$ref": "ProxyServer", "optional": true, "description": "The proxy server to be used for SOCKS requests."}
3754 } 3754 }
3755 }, 3755 },
3756 { 3756 {
3757 "id": "PacScript", 3757 "id": "PacScript",
3758 "type": "object", 3758 "type": "object",
3759 "description": "An object holding proxy auto-config information. Only on e of the fields should be non-empty.", 3759 "description": "An object holding proxy auto-config information. Only on e of the fields should be non-empty.",
3760 "properties": { 3760 "properties": {
3761 "url": {"type": "string", "optional": true, "description": "URL of he PAC file to be used."} 3761 "url": {"type": "string", "optional": true, "description": "URL of he PAC file to be used."}
3762 } 3762 }
3763 }, 3763 },
3764 { 3764 {
3765 "id": "ProxyConfig", 3765 "id": "ProxyConfig",
3766 "type": "object", 3766 "type": "object",
3767 "description": "An object encapsulating a complete proxy configuration." , 3767 "description": "An object encapsulating a complete proxy configuration." ,
3768 "properties": { 3768 "properties": {
3769 "rules": {"$ref": "ProxyRules", "optional": true, "description": "The proxy rules describing this configuration."}, 3769 "rules": {"$ref": "ProxyRules", "optional": true, "description": "The proxy rules describing this configuration. Use this for 'fixed_servers' mode."},
3770 "pacScript": {"$ref": "PacScript", "optional": true, "description": "T he proxy auto-config (PAC) script for this configuration."}, 3770 "pacScript": {"$ref": "PacScript", "optional": true, "description": "T he proxy auto-config (PAC) script for this configuration. Use this for 'pac_scri pt' mode."},
3771 "mode": { 3771 "mode": {
3772 "type": "string", 3772 "type": "string",
3773 "enum": ["direct", "auto_detect", "pac_script", "fixed_servers", "sy stem"], 3773 "enum": ["direct", "auto_detect", "pac_script", "fixed_servers", "sy stem"],
3774 "description": "'direct' = Never use a proxy<br>'auto_detect' = Auto detect proxy settings<br>'pac_script' = Use specified PAC script<br>'fixed_serv ers' = Manually specify proxy servers<br>'system' = Use system proxy settings" 3774 "description": "'direct' = Never use a proxy<br>'auto_detect' = Auto detect proxy settings<br>'pac_script' = Use specified PAC script<br>'fixed_serv ers' = Manually specify proxy servers<br>'system' = Use system proxy settings"
3775 } 3775 }
3776 } 3776 }
3777 } 3777 }
3778 ], 3778 ],
3779 "functions": [ 3779 "functions": [
3780 { 3780 {
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
4525 "token": { "type": "string", "optional": true } 4525 "token": { "type": "string", "optional": true }
4526 } 4526 }
4527 } 4527 }
4528 ] 4528 ]
4529 } 4529 }
4530 ] 4530 ]
4531 } 4531 }
4532 ] 4532 ]
4533 } 4533 }
4534 ] 4534 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698