chrome/common/extensions/docs/proxy.html - Issue 6992022: Move Proxy Settings API out of experimental

Unified Diff: chrome/common/extensions/docs/proxy.html

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

Index: chrome/common/extensions/docs/proxy.html

diff --git a/chrome/common/extensions/docs/experimental.proxy.html b/chrome/common/extensions/docs/proxy.html

similarity index 97%

rename from chrome/common/extensions/docs/experimental.proxy.html

rename to chrome/common/extensions/docs/proxy.html

index 20867e89d87544e7c3533b220ce9ae5e677539d7..141613bf75fb99d5bac77d031d4770c79eab5a68 100644

--- a/chrome/common/extensions/docs/experimental.proxy.html

+++ b/chrome/common/extensions/docs/proxy.html

@@ -293,7 +293,7 @@

</ol>

</li>

<li>

- <a href="#apiReference">API reference: chrome.experimental.proxy</a>

+ <a href="#apiReference">API reference: chrome.proxy</a>

<ol>

<li>

<a href="#properties">Properties</a>

@@ -349,10 +349,8 @@

-Use the <code>chrome.experimental.proxysettings</code> module to manage Chrome's

-proxy settings. This module is still experimental. For information on how to use

-experimental APIs, see the <a href="experimental.html">chrome.experimental.*

- APIs</a> page.

+Use the <code>chrome.proxy</code> module to manage Chrome's

+proxy settings.

<h2 id="manifest">Manifest</h2>

@@ -364,7 +362,7 @@ For example:

"name": "My extension",

...

"permissions": [

- "experimental", "proxy"

+ "proxy"

],

...

}</pre>

@@ -372,7 +370,7 @@ For example:

<h2 id="description">Objects and properties</h2>

-Proxy settings are defined in a

+Proxy settings are defined in a

<a href="#type-ProxyConfig"><code>ProxyConfig</code></a> object. Depending on

Chrome's proxy settings, the settings may contain

<a href="#type-ProxyRules"><code>ProxyRules</code></a> or a <a href="#type-PacScript"><code>PacScript</code></a>.

@@ -486,7 +484,7 @@ Individual servers may be excluded from being proxied with the

Examples: <code>"127.0.1", "[0:0::1]", "[::1]", "http://[::1]:99"</code></dd>

- <dd>Match any URL containing an IP literal within the given range. The IP

+ <dd>Match any URL containing an IP literal within the given range. The IP

range is specified using CIDR notation.

Examples: <code>"192.168.1.1/16", "fefe:13::abc/33"</code></dd>

@@ -516,6 +514,7 @@ As the list implies, policies might overrule any changes that you specify with

the proxy settings API.

+<!--

Chrome allows using different proxy settings for regular windows and incognito

windows. The following example illustrates the behavior. Assume that no policy

@@ -524,7 +523,7 @@ regular windows (R) and proxy settings for incognito windows (I).

-<ul>

+<ul>

<li>If only (R) is set, these settings are effective for both regular

and incognito windows.</li>

<li>If only (I) is set, these settings are effective for only incognito

@@ -533,7 +532,7 @@ regular windows (R) and proxy settings for incognito windows (I).

<li>If both (R) and (I) are set, the respective settings are

used for regular and incognito windows.</li>

</ul>

-

+

If two extensions want to set proxy settings, the extension installed last takes

@@ -541,6 +540,7 @@ precedence over the other extensions. If the extension installed last sets only

(I), the settings of regular windows can be defined by more recently

installed extensions.

+-->

@@ -562,7 +562,7 @@ apply to regular and incognito windows.

bypassList: ["foobar.com"]

}

};

-chrome.experimental.proxy.settings.set(

+chrome.proxy.settings.set(

{value: config, scope: 'regular'},

function() {});

</pre>

@@ -581,7 +581,7 @@ The following code sets a custom pac script.

"}"

}

};

-chrome.experimental.proxy.settings.set(

+chrome.proxy.settings.set(

{value: config, scope: 'regular'},

function() {});

</pre>

@@ -590,7 +590,7 @@ chrome.experimental.proxy.settings.set(

The next snippet queries the current proxy settings.

-<pre>chrome.experimental.proxy.settings.get(

+<pre>chrome.proxy.settings.get(

{'incognito': false},

function(config) {console.log(JSON.stringify(config));});

</pre>

@@ -598,8 +598,8 @@ The next snippet queries the current proxy settings.

Note that the <code>value</code> object passed to <code>set()</code> is not

identical to the <code>value</code> object passed to callback function of

-<code>get()</code>. The latter will contain a <code>rules.httpProxy.port</code>

-element.

+<code>get()</code>. The latter will contain a

+<code>rules.httpProxy.port</code> element.

@@ -608,7 +608,7 @@ element.

- <h2>API reference: chrome.experimental.proxy</h2>

+ <h2>API reference: chrome.proxy</h2>

@@ -620,7 +620,7 @@ element.

<h4>settings</h4>

- chrome.experimental.proxy.settings

+ chrome.proxy.settings

</div>

<div>

<dt>

@@ -634,7 +634,7 @@ element.

enumerated

- <a href="experimental.extension.html#type-Preference">Preference</a>

+ <a href="preferences.html#type-Preference">Preference</a>

@@ -780,7 +780,7 @@ element.

- chrome.experimental.proxy.onProxyError.addListener(function(object details) {...}));

+ chrome.proxy.onProxyError.addListener(function(object details) {...}));

</div>

@@ -1431,7 +1431,7 @@ element.

enumerated

- <a href="experimental.proxy.html#type-ProxyServer">ProxyServer</a>