Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/experimental.processes.html

Index: chrome/common/extensions/docs/experimental.processes.html
===================================================================
--- chrome/common/extensions/docs/experimental.processes.html	(revision 151318)
+++ chrome/common/extensions/docs/experimental.processes.html	(working copy)
@@ -228,11 +228,11 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-Process">null</a>
+                <a href="#type-experimental.processes.Process">Process</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-Cache">null</a>
+                <a href="#type-experimental.processes.Cache">Cache</a>
                 <ol>
                 </ol>
               </li>
@@ -502,7 +502,7 @@
               <h4>onCreated</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.processes.</span><span>onCreated</span><span class="subdued">.addListener</span>(function(<span>Process process</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.experimental.processes.</span><span>onCreated</span><span class="subdued">.addListener</span>(function(<span>experimental.processes.Process process</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired each time a process is created, providing the corrseponding Process object.</p>
@@ -520,7 +520,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.processes.html#type-Process">Process</a>
+                        <a href="experimental.processes.html#type-experimental.processes.Process">experimental.processes.Process</a>
                       </span>
                     </span>
                   )
@@ -638,7 +638,7 @@
               <h4>onUnresponsive</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.processes.</span><span>onUnresponsive</span><span class="subdued">.addListener</span>(function(<span>Process process</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.experimental.processes.</span><span>onUnresponsive</span><span class="subdued">.addListener</span>(function(<span>experimental.processes.Process process</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired each time a process becomes unresponsive, providing the corrseponding Process object.</p>
@@ -656,7 +656,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.processes.html#type-Process">Process</a>
+                        <a href="experimental.processes.html#type-experimental.processes.Process">experimental.processes.Process</a>
                       </span>
                     </span>
                   )
@@ -776,8 +776,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-Process"></a>
-              <h4>Process</h4>
+              <a name="type-experimental.processes.Process"></a>
+              <h4>experimental.processes.Process</h4>
               <div>
           <dt>
               <em>
@@ -1099,7 +1099,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.processes.html#type-Cache">Cache</a>
+                        <a href="experimental.processes.html#type-experimental.processes.Cache">experimental.processes.Cache</a>
                       </span>
                     </span>
                   )
@@ -1123,7 +1123,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.processes.html#type-Cache">Cache</a>
+                        <a href="experimental.processes.html#type-experimental.processes.Cache">experimental.processes.Cache</a>
                       </span>
                     </span>
                   )
@@ -1147,7 +1147,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.processes.html#type-Cache">Cache</a>
+                        <a href="experimental.processes.html#type-experimental.processes.Cache">experimental.processes.Cache</a>
                       </span>
                     </span>
                   )
@@ -1168,8 +1168,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-Cache"></a>
-              <h4>Cache</h4>
+              <a name="type-experimental.processes.Cache"></a>
+              <h4>experimental.processes.Cache</h4>
               <div>
           <dt>
               <em>