Move Proxy Settings API out of experimental

chrome/common/extensions/docs/static/proxy.html

Index: chrome/common/extensions/docs/static/proxy.html
diff --git a/chrome/common/extensions/docs/static/experimental.proxy.html b/chrome/common/extensions/docs/static/proxy.html
similarity index 94%
rename from chrome/common/extensions/docs/static/experimental.proxy.html
rename to chrome/common/extensions/docs/static/proxy.html
index d391a9531026511fdb46cc2c7637367ab66200b4..d53efdabe903ed3537153954130666ef54a72662 100644
--- a/chrome/common/extensions/docs/static/experimental.proxy.html
+++ b/chrome/common/extensions/docs/static/proxy.html
@@ -2,10 +2,8 @@
 
 <!-- BEGIN AUTHORED CONTENT -->
 <p id="classSummary">
-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.
 </p>
 
 <h2 id="manifest">Manifest</h2>
@@ -17,7 +15,7 @@ For example:</p>
   "name": "My extension",
   ...
   <b>"permissions": [
-    "experimental", "proxy"
+    "proxy"
   ]</b>,
   ...
 }</pre>
@@ -140,7 +138,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>
 
   <dt><code><em>&lt;ip-literal&gt;</em>/<em>&lt;prefix-length-in-bits&gt;</em></code></dt>
-  <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.<br>
   Examples: <code>"192.168.1.1/16", "fefe:13::abc/33"</code></dd>
 
@@ -170,6 +168,7 @@ As the list implies, policies might overrule any changes that you specify with
 the proxy settings API.
 </p>
 
+<!--
 <p>
 Chrome allows using different proxy settings for regular windows and incognito
 windows. The following example illustrates the behavior. Assume that no policy
@@ -195,6 +194,7 @@ precedence over the other extensions. If the extension installed last sets only
 <b>(I)</b>, the settings of regular windows can be defined by more recently
 installed extensions.
 </p>
+-->
 
 
 
@@ -217,7 +217,7 @@ var config = {
     bypassList: ["foobar.com"]
   }
 };
-chrome.experimental.proxy.settings.set(
+chrome.proxy.settings.set(
     {value: config, scope: 'regular'},
     function() {});
 </pre>
@@ -237,7 +237,7 @@ var config = {
           "}"
   }
 };
-chrome.experimental.proxy.settings.set(
+chrome.proxy.settings.set(
     {value: config, scope: 'regular'},
     function() {});
 </pre>
@@ -247,7 +247,7 @@ The next snippet queries the current proxy settings.
 </p>
 
 <pre>
-chrome.experimental.proxy.settings.get(
+chrome.proxy.settings.getEffective(
     {'incognito': false},

[Matt Perry, 2011/05/24 18:15:30]

this sample code is out of date, right?

[battre, 2011/05/24 18:22:53]

in my opinion, getEffective should continue to have a true/false parameter (see
my other comment).

     function(config) {console.log(JSON.stringify(config));});
 </pre>
@@ -255,8 +255,8 @@ chrome.experimental.proxy.settings.get(
 <p>
 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>getEffective()</code>. The latter will contain a
+<code>rules.httpProxy.port</code> element.
 </p>
 
 <!-- END AUTHORED CONTENT -->