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

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

Issue 6468002: Implementation of getCurrentProxySettings for proxy settings API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/out/Debug
Patch Set: Removed todo and ask mpcomplete now. 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 3725 matching lines...) Expand 10 before | Expand all | Expand 10 after
3736 ] 3736 ]
3737 }, 3737 },
3738 { 3738 {
3739 "namespace": "experimental.proxy", 3739 "namespace": "experimental.proxy",
3740 "types": [ 3740 "types": [
3741 { 3741 {
3742 "id": "ProxyServer", 3742 "id": "ProxyServer",
3743 "type": "object", 3743 "type": "object",
3744 "description": "An object encapsulating a single proxy server's specific ation.", 3744 "description": "An object encapsulating a single proxy server's specific ation.",
3745 "properties": { 3745 "properties": {
3746 "scheme": {"type": "string", "optional": true, "enum": ["http", "socks ", "socks4", "socks5"], "description": "The scheme (protocol) of the proxy serve r itself."}, 3746 "scheme": {"type": "string", "optional": true, "enum": ["http", "https ", "socks", "socks4", "socks5"], "description": "The scheme (protocol) of the pr oxy server itself."},
3747 "host": {"type": "string", "description": "The URI of the proxy server ."}, 3747 "host": {"type": "string", "description": "The URI of the proxy server ."},
3748 "port": {"type": "integer", "optional": true, "description": "The port of the proxy server."} 3748 "port": {"type": "integer", "optional": true, "description": "The port of the proxy server."}
3749 } 3749 }
3750 }, 3750 },
3751 { 3751 {
3752 "id": "ProxyRules", 3752 "id": "ProxyRules",
3753 "type": "object", 3753 "type": "object",
3754 "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'.", 3754 "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'.",
3755 "properties": { 3755 "properties": {
3756 "singleProxy": {"$ref": "ProxyServer", "optional": true, "description" : "The proxy server to be used for all per-URL requests (i.e., http, https, and ftp)."}, 3756 "singleProxy": {"$ref": "ProxyServer", "optional": true, "description" : "The proxy server to be used for all per-URL requests (i.e., http, https, and ftp)."},
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
3806 "type": "function", 3806 "type": "function",
3807 "description": "Remove a custom proxy set by the current extension. This is the inverse of useCustomProxySettings.", 3807 "description": "Remove a custom proxy set by the current extension. This is the inverse of useCustomProxySettings.",
3808 "parameters": [ 3808 "parameters": [
3809 { 3809 {
3810 "name": "incognito", 3810 "name": "incognito",
3811 "type": "boolean", 3811 "type": "boolean",
3812 "description": "See incognito parameter of useCustomProxySettings.", 3812 "description": "See incognito parameter of useCustomProxySettings.",
3813 "optional": true 3813 "optional": true
3814 } 3814 }
3815 ] 3815 ]
3816 },
3817 {
3818 "name": "getCurrentProxySettings",
3819 "type": "function",
3820 "description": "Returns the currently effective proxy settings. These ca n originate from default values, command line options, the extension settings AP I, policies and possibly other sources in the future.",
3821 "parameters": [
3822 {
3823 "name": "incognito",
3824 "type": "boolean",
3825 "description": "See incognito parameter of useCustomProxySettings."
3826 },
3827 {
3828 "name": "callback",
3829 "type": "function",
3830 "parameters": [
3831 {
3832 "name": "config",
3833 "$ref": "ProxyConfig",
3834 "description": "Configuration, not necessarily a literal copy of the configuration passed to useCustomProxySettings."
3835 }
3836 ]
3837 }
3838 ]
3816 } 3839 }
3817 ] 3840 ]
3818 }, 3841 },
3819 { 3842 {
3820 "namespace": "experimental.clipboard", 3843 "namespace": "experimental.clipboard",
3821 "types": [], 3844 "types": [],
3822 "functions": [ 3845 "functions": [
3823 { 3846 {
3824 "name": "executeCopy", 3847 "name": "executeCopy",
3825 "type": "function", 3848 "type": "function",
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
4532 "token": { "type": "string", "optional": true } 4555 "token": { "type": "string", "optional": true }
4533 } 4556 }
4534 } 4557 }
4535 ] 4558 ]
4536 } 4559 }
4537 ] 4560 ]
4538 } 4561 }
4539 ] 4562 ]
4540 } 4563 }
4541 ] 4564 ]
OLDNEW
« no previous file with comments | « chrome/browser/prefs/proxy_prefs.cc ('k') | chrome/common/extensions/docs/experimental.proxy.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698