chrome/renderer/resources/renderer_extension_bindings.js - 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/renderer/resources/renderer_extension_bindings.js

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/renderer/resources/renderer_extension_bindings.js

diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js

index 5427e1ad43595f824e232edf0ba2c6939e30802c..f77330377e452b52232d2c772c3b4207ff0e4e67 100644

--- a/chrome/renderer/resources/renderer_extension_bindings.js

+++ b/chrome/renderer/resources/renderer_extension_bindings.js

@@ -310,7 +310,6 @@ var chrome = chrome || {};

"experimental.metrics",

"experimental.popup",

"experimental.processes",

- "experimental.proxy",

"experimental.rlz",

"experimental.sidebar",

"experimental.tts",

@@ -325,6 +324,8 @@ var chrome = chrome || {};

"omnibox",

"pageAction",

"pageActions",

+ "preferences",

+ "proxy",

"tabs",

"test",

"toolstrip",