Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/devtools.network.html

Index: chrome/common/extensions/docs/devtools.network.html
===================================================================
--- chrome/common/extensions/docs/devtools.network.html	(revision 151318)
+++ chrome/common/extensions/docs/devtools.network.html	(working copy)
@@ -229,13 +229,13 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-Request">null</a>
+                <a href="#type-devtools.network.Request">Request</a>
                 <ol>
                   <li>
-            <a href="#global-Request-methods">Methods</a>
+            <a href="#global-devtools.network.Request-methods">Methods</a>
             <ol>
               <li>
-                <a href="#method-Request-getContent">getContent</a>
+                <a href="#method-devtools.network.Request-getContent">getContent</a>
               </li>
             </ol>
           </li>
@@ -412,7 +412,7 @@
               <h4>onRequestFinished</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.devtools.network.</span><span>onRequestFinished</span><span class="subdued">.addListener</span>(function(<span>Request request</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.devtools.network.</span><span>onRequestFinished</span><span class="subdued">.addListener</span>(function(<span>devtools.network.Request request</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a network request is finished and all request data are available.</p>
@@ -430,7 +430,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="devtools.network.html#type-Request">Request</a>
+                        <a href="devtools.network.html#type-devtools.network.Request">devtools.network.Request</a>
                       </span>
                     </span>
                   )
@@ -460,8 +460,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-Request"></a>
-              <h4>Request</h4>
+              <a name="type-devtools.network.Request"></a>
+              <h4>devtools.network.Request</h4>
               <div>
           <dt>
               <em>
@@ -482,15 +482,15 @@
           <!-- OBJECT METHODS -->
           <dd>
             <div class="apiGroup">
-            <a name="global-Request-methods"></a>
-            <h3>Methods of Request</h3>
+            <a name="global-devtools.network.Request-methods"></a>
+            <h3>Methods of devtools.network.Request</h3>
             <!-- iterates over all functions -->
             <div class="apiItem">
-              <a name="method-Request-getContent"></a> <!-- method-anchor -->
+              <a name="method-devtools.network.Request-getContent"></a> <!-- method-anchor -->
               <h4>getContent</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>request.getContent</span>(<span class="null"><span>function</span>
+                  <span>devtools.network.Request.getContent</span>(<span class="null"><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
                 <p>Returns content of the response body.</p>