Index: chrome/common/extensions/docs/experimental.proxy.html |
diff --git a/chrome/common/extensions/docs/experimental.proxy.html b/chrome/common/extensions/docs/experimental.proxy.html |
index c6c888239d2c48f3d82c847ac680e1db9842398e..e0f01875f6ac2879d64427dc2dfe259e6e741cf7 100644 |
--- a/chrome/common/extensions/docs/experimental.proxy.html |
+++ b/chrome/common/extensions/docs/experimental.proxy.html |
@@ -280,6 +280,8 @@ |
<a href="#global-methods">Methods</a> |
<ol> |
<li> |
+ <a href="#method-getCurrentProxySettings">getCurrentProxySettings</a> |
+ </li><li> |
<a href="#method-removeCustomProxySettings">removeCustomProxySettings</a> |
</li><li> |
<a href="#method-useCustomProxySettings">useCustomProxySettings</a> |
@@ -352,6 +354,271 @@ |
<!-- iterates over all functions --> |
<div class="apiItem"> |
+ <a name="method-getCurrentProxySettings"></a> <!-- method-anchor --> |
+ <h4>getCurrentProxySettings</h4> |
+ |
+ <div class="summary"><span style="display: none; ">void</span> |
+ <!-- Note: intentionally longer 80 columns --> |
+ <span>chrome.experimental.proxy.getCurrentProxySettings</span>(<span class="null"><span style="display: none; ">, </span><span>boolean</span> |
+ <var><span>incognito</span></var></span><span class="null"><span>, </span><span>function</span> |
+ <var><span>callback</span></var></span>)</div> |
+ |
+ <div class="description"> |
+ <p class="todo" style="display: none; ">Undocumented.</p> |
+ <p>Returns the currently effective proxy settings. These can originate from default values, command line options, the extension settings API, policies and possibly other sources in the future.</p> |
+ |
+ <!-- PARAMETERS --> |
+ <h4>Parameters</h4> |
+ <dl> |
+ <div> |
+ <div> |
+ <dt> |
+ <var>incognito</var> |
+ <em> |
+ |
+ <!-- TYPE --> |
+ <div style="display:inline"> |
+ ( |
+ <span class="optional" style="display: none; ">optional</span> |
+ <span class="enum" style="display: none; ">enumerated</span> |
+ <span id="typeTemplate"> |
+ <span style="display: none; "> |
+ <a> Type</a> |
+ </span> |
+ <span> |
+ <span style="display: none; "> |
+ array of <span><span></span></span> |
+ </span> |
+ <span>boolean</span> |
+ <span style="display: none; "></span> |
+ </span> |
+ </span> |
+ ) |
+ </div> |
+ |
+ </em> |
+ </dt> |
+ <dd class="todo" style="display: none; "> |
+ Undocumented. |
+ </dd> |
+ <dd>See incognito parameter of useCustomProxySettings.</dd> |
+ <dd style="display: none; "> |
+ This parameter was added in version |
+ <b><span></span></b>. |
+ You must omit this parameter in earlier versions, |
+ and you may omit it in any version. If you require this |
+ parameter, the manifest key |
+ <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> |
+ can ensure that your extension won't be run in an earlier browser version. |
+ </dd> |
+ |
+ <!-- OBJECT PROPERTIES --> |
+ <dd style="display: none; "> |
+ <dl> |
+ <div> |
+ <div> |
+ </div> |
+ </div> |
+ </dl> |
+ </dd> |
+ |
+ <!-- OBJECT METHODS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ <!-- OBJECT EVENT FIELDS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ <!-- FUNCTION PARAMETERS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ </div> |
+ </div><div> |
+ <div> |
+ <dt> |
+ <var>callback</var> |
+ <em> |
+ |
+ <!-- TYPE --> |
+ <div style="display:inline"> |
+ ( |
+ <span class="optional" style="display: none; ">optional</span> |
+ <span class="enum" style="display: none; ">enumerated</span> |
+ <span id="typeTemplate"> |
+ <span style="display: none; "> |
+ <a> Type</a> |
+ </span> |
+ <span> |
+ <span style="display: none; "> |
+ array of <span><span></span></span> |
+ </span> |
+ <span>function</span> |
+ <span style="display: none; "></span> |
+ </span> |
+ </span> |
+ ) |
+ </div> |
+ |
+ </em> |
+ </dt> |
+ <dd class="todo"> |
+ Undocumented. |
+ </dd> |
+ <dd style="display: none; "> |
+ Description of this parameter from the json schema. |
+ </dd> |
+ <dd style="display: none; "> |
+ This parameter was added in version |
+ <b><span></span></b>. |
+ You must omit this parameter in earlier versions, |
+ and you may omit it in any version. If you require this |
+ parameter, the manifest key |
+ <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> |
+ can ensure that your extension won't be run in an earlier browser version. |
+ </dd> |
+ |
+ <!-- OBJECT PROPERTIES --> |
+ <dd style="display: none; "> |
+ <dl> |
+ <div> |
+ <div> |
+ </div> |
+ </div> |
+ </dl> |
+ </dd> |
+ |
+ <!-- OBJECT METHODS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ <!-- OBJECT EVENT FIELDS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ <!-- FUNCTION PARAMETERS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ </div> |
+ </div> |
+ </dl> |
+ |
+ <!-- RETURNS --> |
+ <h4 style="display: none; ">Returns</h4> |
+ <dl> |
+ <div style="display: none; "> |
+ <div> |
+ </div> |
+ </div> |
+ </dl> |
+ |
+ <!-- CALLBACK --> |
+ <div> |
+ <div> |
+ <h4>Callback function</h4> |
+ <p> |
+ The callback <em>parameter</em> should specify a function |
+ that looks like this: |
+ </p> |
+ <p style="display: none; "> |
+ If you specify the <em>callback</em> parameter, it should |
+ specify a function that looks like this: |
+ </p> |
+ |
+ <!-- Note: intentionally longer 80 columns --> |
+ <pre>function(<span>ProxyConfig config</span>) <span class="subdued">{...}</span>;</pre> |
+ <dl> |
+ <div> |
+ <div> |
+ <dt> |
+ <var>config</var> |
+ <em> |
+ |
+ <!-- TYPE --> |
+ <div style="display:inline"> |
+ ( |
+ <span class="optional" style="display: none; ">optional</span> |
+ <span class="enum" style="display: none; ">enumerated</span> |
+ <span id="typeTemplate"> |
+ <span> |
+ <a href="experimental.proxy.html#type-ProxyConfig">ProxyConfig</a> |
+ </span> |
+ <span style="display: none; "> |
+ <span> |
+ array of <span><span></span></span> |
+ </span> |
+ <span>paramType</span> |
+ <span></span> |
+ </span> |
+ </span> |
+ ) |
+ </div> |
+ |
+ </em> |
+ </dt> |
+ <dd class="todo" style="display: none; "> |
+ Undocumented. |
+ </dd> |
+ <dd>Configuration, not necessarily a literal copy of the configuration passed to useCustomProxySettings.</dd> |
+ <dd style="display: none; "> |
+ This parameter was added in version |
+ <b><span></span></b>. |
+ You must omit this parameter in earlier versions, |
+ and you may omit it in any version. If you require this |
+ parameter, the manifest key |
+ <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> |
+ can ensure that your extension won't be run in an earlier browser version. |
+ </dd> |
+ |
+ <!-- OBJECT PROPERTIES --> |
+ <dd style="display: none; "> |
+ <dl> |
+ <div> |
+ <div> |
+ </div> |
+ </div> |
+ </dl> |
+ </dd> |
+ |
+ <!-- OBJECT METHODS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ <!-- OBJECT EVENT FIELDS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ <!-- FUNCTION PARAMETERS --> |
+ <dd style="display: none; "> |
+ <div></div> |
+ </dd> |
+ |
+ </div> |
+ </div> |
+ </dl> |
+ </div> |
+ </div> |
+ |
+ <!-- MIN_VERSION --> |
+ <p style="display: none; "> |
+ This function was added in version <b><span></span></b>. |
+ If you require this function, the manifest key |
+ <a href="manifest.html#minimum_chrome_version">minimum_chrome_version</a> |
+ can ensure that your extension won't be run in an earlier browser version. |
+ </p> |
+ </div> <!-- /description --> |
+ |
+ </div><div class="apiItem"> |
<a name="method-removeCustomProxySettings"></a> <!-- method-anchor --> |
<h4>removeCustomProxySettings</h4> |
@@ -794,7 +1061,7 @@ |
array of <span><span></span></span> |
</span> |
<span>string</span> |
- <span>["http", "socks", "socks4", "socks5"]</span> |
+ <span>["http", "https", "socks", "socks4", "socks5"]</span> |
</span> |
</span> |
) |