Index: chrome/common/extensions/docs/declarativeWebRequest.html |
diff --git a/chrome/common/extensions/docs/declarativeWebRequest.html b/chrome/common/extensions/docs/declarativeWebRequest.html |
index 07d2697b3130b973ee99070bc5c0f90e958a9fdd..c469576e0da3fb01ddf517318106052b083fd4fa 100644 |
--- a/chrome/common/extensions/docs/declarativeWebRequest.html |
+++ b/chrome/common/extensions/docs/declarativeWebRequest.html |
@@ -223,11 +223,11 @@ |
<a href="#types">Types</a> |
<ol> |
<li> |
- <a href="#type-RequestMatcher">RequestMatcher</a> |
+ <a href="#type-declarativeWebRequest.RedirectByRegEx">declarativeWebRequest.RedirectByRegEx</a> |
<ol> |
</ol> |
</li><li> |
- <a href="#type-CancelRequest">CancelRequest</a> |
+ <a href="#type-RequestMatcher">RequestMatcher</a> |
<ol> |
</ol> |
</li><li> |
@@ -243,6 +243,10 @@ |
<ol> |
</ol> |
</li><li> |
+ <a href="#type-CancelRequest">CancelRequest</a> |
+ <ol> |
+ </ol> |
+ </li><li> |
<a href="#type-declarativeWebRequest.SetRequestHeader">declarativeWebRequest.SetRequestHeader</a> |
<ol> |
</ol> |
@@ -467,6 +471,15 @@ very fast URL matching algorithm for hundreds of thousands of URLs. |
</div><div> |
<div> |
<dt> |
+ <a href="declarativeWebRequest.html#type-declarativeWebRequest.RedirectByRegEx">declarativeWebRequest.RedirectByRegEx</a> |
+ </dt> |
+ <dd class="todo"> |
+ Undocumented. |
+ </dd> |
+ </div> |
+ </div><div> |
+ <div> |
+ <dt> |
<a href="declarativeWebRequest.html#type-declarativeWebRequest.SetRequestHeader">declarativeWebRequest.SetRequestHeader</a> |
</dt> |
<dd class="todo"> |
@@ -512,8 +525,8 @@ very fast URL matching algorithm for hundreds of thousands of URLs. |
<h3 id="types">Types</h3> |
<!-- iterates over all types --> |
<div class="apiItem"> |
- <a name="type-RequestMatcher"></a> |
- <h4>RequestMatcher</h4> |
+ <a name="type-declarativeWebRequest.RedirectByRegEx"></a> |
+ <h4>declarativeWebRequest.RedirectByRegEx</h4> |
<div> |
<dt> |
<em> |
@@ -529,29 +542,28 @@ very fast URL matching algorithm for hundreds of thousands of URLs. |
</div> |
</em> |
</dt> |
- <dd>Matches network events by various criteria.</dd> |
+ <dd>Redirects a request by applying a regular expression on the URL. The regular expressions support temporarily the <a href="http://www.unicode.org/reports/tr18/">ICU syntax</a> with $1 to reference capture group 1. This will be replaced with the <a href="http://code.google.com/p/re2/wiki/Syntax">RE2 syntax</a> which uses \1 to reference capture group 1 before the API is released into the beta release of Google Chrome.</dd> |
<!-- OBJECT PROPERTIES --> |
<dd> |
<dl> |
<div> |
<div> |
<dt> |
- <var>url</var> |
+ <var>from</var> |
<em> |
<!-- TYPE --> |
<div style="display:inline"> |
( |
- <span class="optional">optional</span> |
<span id="typeTemplate"> |
<span> |
- <a>events.UrlFilter</a> |
+ <span>string</span> |
</span> |
</span> |
) |
</div> |
</em> |
</dt> |
- <dd>Matches if the condition of the UrlFilter are fulfilled for the URL of the request.</dd> |
+ <dd>A match pattern that may contain capture groups.</dd> |
<!-- OBJECT PROPERTIES --> |
<!-- OBJECT METHODS --> |
<!-- OBJECT EVENT FIELDS --> |
@@ -560,91 +572,111 @@ very fast URL matching algorithm for hundreds of thousands of URLs. |
</div><div> |
<div> |
<dt> |
- <var>resourceType</var> |
+ <var>to</var> |
<em> |
<!-- TYPE --> |
<div style="display:inline"> |
( |
- <span class="optional">optional</span> |
<span id="typeTemplate"> |
<span> |
- <span> |
- array of <span><span> |
- <span> |
<span>string</span> |
- <span>["main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", "other"]</span> |
- </span> |
- </span></span> |
- </span> |
</span> |
</span> |
) |
</div> |
</em> |
</dt> |
- <dd>Matches if the request type of a request is contained in the list. Requests that cannot match any of the types will be filtered out.</dd> |
+ <dd>Destination pattern.</dd> |
<!-- OBJECT PROPERTIES --> |
<!-- OBJECT METHODS --> |
<!-- OBJECT EVENT FIELDS --> |
<!-- FUNCTION PARAMETERS --> |
</div> |
- </div><div> |
+ </div> |
+ </dl> |
+ </dd> |
+ <!-- OBJECT METHODS --> |
+ <!-- OBJECT EVENT FIELDS --> |
+ <!-- FUNCTION PARAMETERS --> |
+ </div> |
+ </div><div class="apiItem"> |
+ <a name="type-RequestMatcher"></a> |
+ <h4>RequestMatcher</h4> |
+ <div> |
+ <dt> |
+ <em> |
+ <!-- TYPE --> |
+ <div style="display:inline"> |
+ ( |
+ <span id="typeTemplate"> |
+ <span> |
+ <span>object</span> |
+ </span> |
+ </span> |
+ ) |
+ </div> |
+ </em> |
+ </dt> |
+ <dd>Matches network events by various criteria.</dd> |
+ <!-- OBJECT PROPERTIES --> |
+ <dd> |
+ <dl> |
+ <div> |
<div> |
<dt> |
- <var>instanceType</var> |
+ <var>url</var> |
<em> |
<!-- TYPE --> |
<div style="display:inline"> |
( |
- <span class="enum">enumerated</span> |
+ <span class="optional">optional</span> |
<span id="typeTemplate"> |
<span> |
- <span>string</span> |
- <span>["declarativeWebRequest.RequestMatcher"]</span> |
+ <a>events.UrlFilter</a> |
</span> |
</span> |
) |
</div> |
</em> |
</dt> |
- <dd class="todo"> |
- Undocumented. |
- </dd> |
+ <dd>Matches if the condition of the UrlFilter are fulfilled for the URL of the request.</dd> |
<!-- OBJECT PROPERTIES --> |
<!-- OBJECT METHODS --> |
<!-- OBJECT EVENT FIELDS --> |
<!-- FUNCTION PARAMETERS --> |
</div> |
- </div> |
- </dl> |
- </dd> |
- <!-- OBJECT METHODS --> |
- <!-- OBJECT EVENT FIELDS --> |
- <!-- FUNCTION PARAMETERS --> |
- </div> |
- </div><div class="apiItem"> |
- <a name="type-CancelRequest"></a> |
- <h4>CancelRequest</h4> |
- <div> |
+ </div><div> |
+ <div> |
<dt> |
+ <var>resourceType</var> |
<em> |
<!-- TYPE --> |
<div style="display:inline"> |
( |
+ <span class="optional">optional</span> |
<span id="typeTemplate"> |
<span> |
- <span>object</span> |
+ <span> |
+ array of <span><span> |
+ <span> |
+ <span>string</span> |
+ <span>["main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", "other"]</span> |
+ </span> |
+ </span></span> |
+ </span> |
</span> |
</span> |
) |
</div> |
</em> |
</dt> |
- <dd>Declarative event action that cancels a network request.</dd> |
+ <dd>Matches if the request type of a request is contained in the list. Requests that cannot match any of the types will be filtered out.</dd> |
<!-- OBJECT PROPERTIES --> |
- <dd> |
- <dl> |
- <div> |
+ <!-- OBJECT METHODS --> |
+ <!-- OBJECT EVENT FIELDS --> |
+ <!-- FUNCTION PARAMETERS --> |
+ </div> |
+ </div><div> |
<div> |
<dt> |
<var>instanceType</var> |
@@ -656,7 +688,7 @@ very fast URL matching algorithm for hundreds of thousands of URLs. |
<span id="typeTemplate"> |
<span> |
<span>string</span> |
- <span>["declarativeWebRequest.CancelRequest"]</span> |
+ <span>["declarativeWebRequest.RequestMatcher"]</span> |
</span> |
</span> |
) |
@@ -814,6 +846,62 @@ very fast URL matching algorithm for hundreds of thousands of URLs. |
<!-- FUNCTION PARAMETERS --> |
</div> |
</div><div class="apiItem"> |
+ <a name="type-CancelRequest"></a> |
+ <h4>CancelRequest</h4> |
+ <div> |
+ <dt> |
+ <em> |
+ <!-- TYPE --> |
+ <div style="display:inline"> |
+ ( |
+ <span id="typeTemplate"> |
+ <span> |
+ <span>object</span> |
+ </span> |
+ </span> |
+ ) |
+ </div> |
+ </em> |
+ </dt> |
+ <dd>Declarative event action that cancels a network request.</dd> |
+ <!-- OBJECT PROPERTIES --> |
+ <dd> |
+ <dl> |
+ <div> |
+ <div> |
+ <dt> |
+ <var>instanceType</var> |
+ <em> |
+ <!-- TYPE --> |
+ <div style="display:inline"> |
+ ( |
+ <span class="enum">enumerated</span> |
+ <span id="typeTemplate"> |
+ <span> |
+ <span>string</span> |
+ <span>["declarativeWebRequest.CancelRequest"]</span> |
+ </span> |
+ </span> |
+ ) |
+ </div> |
+ </em> |
+ </dt> |
+ <dd class="todo"> |
+ Undocumented. |
+ </dd> |
+ <!-- OBJECT PROPERTIES --> |
+ <!-- OBJECT METHODS --> |
+ <!-- OBJECT EVENT FIELDS --> |
+ <!-- FUNCTION PARAMETERS --> |
+ </div> |
+ </div> |
+ </dl> |
+ </dd> |
+ <!-- OBJECT METHODS --> |
+ <!-- OBJECT EVENT FIELDS --> |
+ <!-- FUNCTION PARAMETERS --> |
+ </div> |
+ </div><div class="apiItem"> |
<a name="type-declarativeWebRequest.SetRequestHeader"></a> |
<h4>declarativeWebRequest.SetRequestHeader</h4> |
<div> |