chrome/common/extensions/api/extension_api.json - Issue 6992022: Move Proxy Settings API out of experimental

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/common/extensions/api/extension_api.json

diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json

index 5b76600759bb3511ab164971037d49c26667af35..456b9b8aceafb86ad29d452d364cb2674e016a33 100644

--- a/chrome/common/extensions/api/extension_api.json

+++ b/chrome/common/extensions/api/extension_api.json

@@ -4194,7 +4194,7 @@

]

{

- "namespace": "experimental.proxy",

+ "namespace": "proxy",

"types": [

{

"id": "ProxyServer",

@@ -5314,7 +5314,7 @@

"events": []

{

- "namespace": "experimental.extension",

+ "namespace": "preferences",

"types": [

{

"id": "Preference",