Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/webRequest.html

Index: chrome/common/extensions/docs/webRequest.html
===================================================================
--- chrome/common/extensions/docs/webRequest.html	(revision 151318)
+++ chrome/common/extensions/docs/webRequest.html	(working copy)
@@ -258,15 +258,15 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-RequestFilter">null</a>
+                <a href="#type-webRequest.RequestFilter">RequestFilter</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-HttpHeaders">null</a>
+                <a href="#type-webRequest.HttpHeaders">HttpHeaders</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-BlockingResponse">null</a>
+                <a href="#type-webRequest.BlockingResponse">BlockingResponse</a>
                 <ol>
                 </ol>
               </li>
@@ -615,7 +615,7 @@
               <h4>onAuthRequired</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onAuthRequired</span><span class="subdued">.addListener</span>(function(<span>object details, function callback</span>) <span class="subdued">{...}</span><span>, RequestFilter filter, array of string extraInfoSpec</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onAuthRequired</span><span class="subdued">.addListener</span>(function(<span>object details, function callback</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter, array of string extraInfoSpec</span>);
               </div>
               <div class="description">
                 <p>Fired when an authentication failure is received. The listener has three options: it can provide authentication credentials, it can cancel the request and display the error page, or it can take no action on the challenge. If bad user credentials are provided, this may be called multiple times for the same request.</p>
@@ -993,7 +993,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )
@@ -1080,7 +1080,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -1140,7 +1140,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-BlockingResponse">BlockingResponse</a>
+                        <a href="webRequest.html#type-webRequest.BlockingResponse">webRequest.BlockingResponse</a>
                       </span>
                     </span>
                   )
@@ -1162,7 +1162,7 @@
               <h4>onBeforeRedirect</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onBeforeRedirect</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, RequestFilter filter, array of string extraInfoSpec</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onBeforeRedirect</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter, array of string extraInfoSpec</span>);
               </div>
               <div class="description">
                 <p>Fired when a server-initiated redirect is about to occur.</p>
@@ -1485,7 +1485,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )
@@ -1546,7 +1546,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -1603,7 +1603,7 @@
               <h4>onBeforeRequest</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onBeforeRequest</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, RequestFilter filter, array of string extraInfoSpec</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onBeforeRequest</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter, array of string extraInfoSpec</span>);
               </div>
               <div class="description">
                 <p>Fired when a request is about to occur.</p>
@@ -1846,7 +1846,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -1906,7 +1906,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-BlockingResponse">BlockingResponse</a>
+                        <a href="webRequest.html#type-webRequest.BlockingResponse">webRequest.BlockingResponse</a>
                       </span>
                     </span>
                   )
@@ -1928,7 +1928,7 @@
               <h4>onBeforeSendHeaders</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onBeforeSendHeaders</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, RequestFilter filter, array of string extraInfoSpec</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onBeforeSendHeaders</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter, array of string extraInfoSpec</span>);
               </div>
               <div class="description">
                 <p>Fired before sending an HTTP request, once the request headers are available. This may occur after a TCP connection is made to the server, but before any HTTP data is sent. </p>
@@ -2158,7 +2158,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )
@@ -2195,7 +2195,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -2255,7 +2255,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-BlockingResponse">BlockingResponse</a>
+                        <a href="webRequest.html#type-webRequest.BlockingResponse">webRequest.BlockingResponse</a>
                       </span>
                     </span>
                   )
@@ -2277,7 +2277,7 @@
               <h4>onCompleted</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onCompleted</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, RequestFilter filter, array of string extraInfoSpec</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onCompleted</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter, array of string extraInfoSpec</span>);
               </div>
               <div class="description">
                 <p>Fired when a request is completed.</p>
@@ -2577,7 +2577,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )
@@ -2638,7 +2638,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -2695,7 +2695,7 @@
               <h4>onErrorOccurred</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onErrorOccurred</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, RequestFilter filter</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onErrorOccurred</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter</span>);
               </div>
               <div class="description">
                 <p>Fired when an error occurs.</p>
@@ -3008,7 +3008,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -3034,7 +3034,7 @@
               <h4>onHeadersReceived</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onHeadersReceived</span><span class="subdued">.addListener</span>(function(<span>object deails</span>) <span class="subdued">{...}</span><span>, RequestFilter filter, array of string extraInfoSpec</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onHeadersReceived</span><span class="subdued">.addListener</span>(function(<span>object deails</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter, array of string extraInfoSpec</span>);
               </div>
               <div class="description">
                 <p>Fired when HTTP response headers of a request have been received.</p>
@@ -3288,7 +3288,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )
@@ -3325,7 +3325,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -3385,7 +3385,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-BlockingResponse">BlockingResponse</a>
+                        <a href="webRequest.html#type-webRequest.BlockingResponse">webRequest.BlockingResponse</a>
                       </span>
                     </span>
                   )
@@ -3407,7 +3407,7 @@
               <h4>onResponseStarted</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onResponseStarted</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, RequestFilter filter, array of string extraInfoSpec</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onResponseStarted</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter, array of string extraInfoSpec</span>);
               </div>
               <div class="description">
                 <p>Fired when the first byte of the response body is received. For HTTP requests, this means that the status line and response headers are available.</p>
@@ -3707,7 +3707,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )
@@ -3768,7 +3768,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -3825,7 +3825,7 @@
               <h4>onSendHeaders</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.webRequest.</span><span>onSendHeaders</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, RequestFilter filter, array of string extraInfoSpec</span>);
+                <span class="subdued">chrome.webRequest.</span><span>onSendHeaders</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span>, webRequest.RequestFilter filter, array of string extraInfoSpec</span>);
               </div>
               <div class="description">
                 <p>Fired just before a request is going to be sent to the server (modifications of previous onBeforeSendHeaders callbacks are visible by the time onSendHeaders is fired).</p>
@@ -4055,7 +4055,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )
@@ -4092,7 +4092,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-RequestFilter">RequestFilter</a>
+                        <a href="webRequest.html#type-webRequest.RequestFilter">webRequest.RequestFilter</a>
                       </span>
                     </span>
                   )
@@ -4152,8 +4152,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-RequestFilter"></a>
-              <h4>RequestFilter</h4>
+              <a name="type-webRequest.RequestFilter"></a>
+              <h4>webRequest.RequestFilter</h4>
               <div>
           <dt>
               <em>
@@ -4293,8 +4293,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-HttpHeaders"></a>
-              <h4>HttpHeaders</h4>
+              <a name="type-webRequest.HttpHeaders"></a>
+              <h4>webRequest.HttpHeaders</h4>
               <div>
           <dt>
               <em>
@@ -4405,8 +4405,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-BlockingResponse"></a>
-              <h4>BlockingResponse</h4>
+              <a name="type-webRequest.BlockingResponse"></a>
+              <h4>webRequest.BlockingResponse</h4>
               <div>
           <dt>
               <em>
@@ -4485,7 +4485,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )
@@ -4509,7 +4509,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="webRequest.html#type-HttpHeaders">HttpHeaders</a>
+                        <a href="webRequest.html#type-webRequest.HttpHeaders">webRequest.HttpHeaders</a>
                       </span>
                     </span>
                   )