Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/extension.html

Index: chrome/common/extensions/docs/extension.html
===================================================================
--- chrome/common/extensions/docs/extension.html	(revision 151318)
+++ chrome/common/extensions/docs/extension.html	(working copy)
@@ -251,11 +251,11 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-MessageSender">null</a>
+                <a href="#type-extension.MessageSender">MessageSender</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-Port">null</a>
+                <a href="#type-extension.Port">Port</a>
                 <ol>
                 </ol>
               </li>
@@ -418,7 +418,7 @@
             <div class="apiItem">
               <a name="method-connect"></a> <!-- method-anchor -->
               <h4>connect</h4>
-              <div class="summary"><span>Port</span>
+              <div class="summary"><span>extension.Port</span>
                   <!-- Note: intentionally longer 80 columns -->
                   <span>chrome.extension.connect</span>(<span class="optional"><span>string</span>
                       <var><span>extensionId</span></var></span><span class="optional"><span>, </span><span>object</span>
@@ -521,7 +521,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="extension.html#type-Port">Port</a>
+                        <a href="extension.html#type-extension.Port">extension.Port</a>
                       </span>
                     </span>
                   )
@@ -1067,7 +1067,7 @@
               <h4>onConnect</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.extension.</span><span>onConnect</span><span class="subdued">.addListener</span>(function(<span>Port port</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.extension.</span><span>onConnect</span><span class="subdued">.addListener</span>(function(<span>extension.Port port</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a connection is made from either an extension process or a content script.</p>
@@ -1085,7 +1085,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="extension.html#type-Port">Port</a>
+                        <a href="extension.html#type-extension.Port">extension.Port</a>
                       </span>
                     </span>
                   )
@@ -1114,7 +1114,7 @@
               <h4>onConnectExternal</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.extension.</span><span>onConnectExternal</span><span class="subdued">.addListener</span>(function(<span>Port port</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.extension.</span><span>onConnectExternal</span><span class="subdued">.addListener</span>(function(<span>extension.Port port</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a connection is made from another extension.</p>
@@ -1132,7 +1132,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="extension.html#type-Port">Port</a>
+                        <a href="extension.html#type-extension.Port">extension.Port</a>
                       </span>
                     </span>
                   )
@@ -1225,7 +1225,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="extension.html#type-MessageSender">MessageSender</a>
+                        <a href="extension.html#type-extension.MessageSender">extension.MessageSender</a>
                       </span>
                     </span>
                   )
@@ -1373,7 +1373,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="extension.html#type-MessageSender">MessageSender</a>
+                        <a href="extension.html#type-extension.MessageSender">extension.MessageSender</a>
                       </span>
                     </span>
                   )
@@ -1460,8 +1460,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-MessageSender"></a>
-              <h4>MessageSender</h4>
+              <a name="type-extension.MessageSender"></a>
+              <h4>extension.MessageSender</h4>
               <div>
           <dt>
               <em>
@@ -1492,7 +1492,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a>tabs.Tab</a>
+                        <a href="tabs.html#type-tabs.Tab">tabs.Tab</a>
                       </span>
                     </span>
                   )
@@ -1536,8 +1536,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-Port"></a>
-              <h4>Port</h4>
+              <a name="type-extension.Port"></a>
+              <h4>extension.Port</h4>
               <div>
           <dt>
               <em>
@@ -1592,7 +1592,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a>events.Event</a>
+                        <a href="events.html#type-events.Event">events.Event</a>
                       </span>
                     </span>
                   )
@@ -1617,7 +1617,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a>events.Event</a>
+                        <a href="events.html#type-events.Event">events.Event</a>
                       </span>
                     </span>
                   )
@@ -1668,7 +1668,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="extension.html#type-MessageSender">MessageSender</a>
+                        <a href="extension.html#type-extension.MessageSender">extension.MessageSender</a>
                       </span>
                     </span>
                   )