chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.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/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/common/extensions/docs/examples/extensions/proxy_configuration/manifest.json ('k') | chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_form_controller.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js

diff --git a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js

index bf6d80ab6899daa768af48cc2aa7c80ed1cee8e9..375dc35078a97238cbf601ef56cced3b1db774eb 100644

--- a/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js

+++ b/chrome/common/extensions/docs/examples/extensions/proxy_configuration/proxy_error_handler.js

@@ -19,12 +19,10 @@

function ProxyErrorHandler() {

// Handle proxy error events.

- chrome.experimental.proxy.onProxyError.addListener(

- this.handleError_.bind(this));

+ chrome.proxy.onProxyError.addListener(this.handleError_.bind(this));

// Handle message events from popup.

- chrome.extension.onRequest.addListener(

- this.handleOnRequest_.bind(this));

+ chrome.extension.onRequest.addListener(this.handleOnRequest_.bind(this));

};

///////////////////////////////////////////////////////////////////////////////