chrome/browser/extensions/extension_proxy_api_constants.cc - 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/browser/extensions/extension_proxy_api_constants.cc

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/browser/extensions/extension_proxy_api_constants.cc

diff --git a/chrome/browser/extensions/extension_proxy_api_constants.cc b/chrome/browser/extensions/extension_proxy_api_constants.cc

index 907826535acef97deec19bf6f1028a8af9daf5ae..9203928ebbbb0ec8d8608f49dcfe337fd45c5c8e 100644

--- a/chrome/browser/extensions/extension_proxy_api_constants.cc

+++ b/chrome/browser/extensions/extension_proxy_api_constants.cc

@@ -25,7 +25,7 @@ const char kProxyConfigValue[] = "value";

const char kProxyEventFatal[] = "fatal";

const char kProxyEventError[] = "error";

const char kProxyEventDetails[] = "details";

-const char kProxyEventOnProxyError[] = "experimental.proxy.onProxyError";

+const char kProxyEventOnProxyError[] = "proxy.onProxyError";

const char kPACDataUrlPrefix[] =

"data:application/x-ns-proxy-autoconfig;base64,";