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

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

Issue 6992022: Move Proxy Settings API out of experimental (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed remainder of merge conflict. Fixes unit test Created 9 years, 7 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 4176 matching lines...) Expand 10 before | Expand all | Expand 10 after
4187 "properties": { 4187 "properties": {
4188 "data": { "type": "string", "description": "Additional information ." }, 4188 "data": { "type": "string", "description": "Additional information ." },
4189 "lastMessage": { "type": "boolean", "description": "True if this w as the last message for this test" } 4189 "lastMessage": { "type": "boolean", "description": "True if this w as the last message for this test" }
4190 } 4190 }
4191 } 4191 }
4192 ] 4192 ]
4193 } 4193 }
4194 ] 4194 ]
4195 }, 4195 },
4196 { 4196 {
4197 "namespace": "experimental.proxy", 4197 "namespace": "proxy",
4198 "types": [ 4198 "types": [
4199 { 4199 {
4200 "id": "ProxyServer", 4200 "id": "ProxyServer",
4201 "type": "object", 4201 "type": "object",
4202 "description": "An object encapsulating a single proxy server's specific ation.", 4202 "description": "An object encapsulating a single proxy server's specific ation.",
4203 "properties": { 4203 "properties": {
4204 "scheme": {"type": "string", "optional": true, "enum": ["http", "https ", "socks4", "socks5"], "description": "The scheme (protocol) of the proxy serve r itself. Defaults to 'http'."}, 4204 "scheme": {"type": "string", "optional": true, "enum": ["http", "https ", "socks4", "socks5"], "description": "The scheme (protocol) of the proxy serve r itself. Defaults to 'http'."},
4205 "host": {"type": "string", "description": "The URI of the proxy server . This must be an ASCII hostname (in Punycode format). IDNA is not supported, ye t."}, 4205 "host": {"type": "string", "description": "The URI of the proxy server . This must be an ASCII hostname (in Punycode format). IDNA is not supported, ye t."},
4206 "port": {"type": "integer", "optional": true, "description": "The port of the proxy server. Defaults to a port that depends on the scheme."} 4206 "port": {"type": "integer", "optional": true, "description": "The port of the proxy server. Defaults to a port that depends on the scheme."}
4207 } 4207 }
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after
5307 "description": "Passport for passing to proxy." 5307 "description": "Passport for passing to proxy."
5308 } 5308 }
5309 ] 5309 ]
5310 } 5310 }
5311 ] 5311 ]
5312 } 5312 }
5313 ], 5313 ],
5314 "events": [] 5314 "events": []
5315 }, 5315 },
5316 { 5316 {
5317 "namespace": "experimental.extension", 5317 "namespace": "preferences",
5318 "types": [ 5318 "types": [
5319 { 5319 {
5320 "id": "Preference", 5320 "id": "Preference",
5321 "type": "object", 5321 "type": "object",
5322 "customBindings": "Preference", 5322 "customBindings": "Preference",
5323 "description": "An object which allows access to a preference.", 5323 "description": "An object which allows access to a preference.",
5324 "functions": [ 5324 "functions": [
5325 { 5325 {
5326 "name": "get", 5326 "name": "get",
5327 "type": "function", 5327 "type": "function",
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
5595 { 5595 {
5596 "type": "integer", 5596 "type": "integer",
5597 "name": "tabId", 5597 "name": "tabId",
5598 "description": "The id of the tab that was detached." 5598 "description": "The id of the tab that was detached."
5599 } 5599 }
5600 ] 5600 ]
5601 } 5601 }
5602 ] 5602 ]
5603 } 5603 }
5604 ] 5604 ]
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_proxy_apitest.cc ('k') | chrome/common/extensions/docs/api_index.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698