Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/tabs.html

Index: chrome/common/extensions/docs/tabs.html
===================================================================
--- chrome/common/extensions/docs/tabs.html	(revision 151318)
+++ chrome/common/extensions/docs/tabs.html	(working copy)
@@ -267,7 +267,7 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-Tab">null</a>
+                <a href="#type-tabs.Tab">Tab</a>
                 <ol>
                 </ol>
               </li>
@@ -589,7 +589,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a>extension.Port</a>
+                        <a href="extension.html#type-extension.Port">extension.Port</a>
                       </span>
                     </span>
                   )
@@ -2806,7 +2806,7 @@
               <h4>onCreated</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.tabs.</span><span>onCreated</span><span class="subdued">.addListener</span>(function(<span>Tab tab</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.tabs.</span><span>onCreated</span><span class="subdued">.addListener</span>(function(<span>tabs.Tab tab</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a tab is created. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set.</p>
@@ -2824,7 +2824,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="tabs.html#type-Tab">Tab</a>
+                        <a href="tabs.html#type-tabs.Tab">tabs.Tab</a>
                       </span>
                     </span>
                   )
@@ -3334,7 +3334,7 @@
               <h4>onUpdated</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.tabs.</span><span>onUpdated</span><span class="subdued">.addListener</span>(function(<span>integer tabId, object changeInfo, Tab tab</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.tabs.</span><span>onUpdated</span><span class="subdued">.addListener</span>(function(<span>integer tabId, object changeInfo, tabs.Tab tab</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a tab is updated.</p>
@@ -3477,7 +3477,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="tabs.html#type-Tab">Tab</a>
+                        <a href="tabs.html#type-tabs.Tab">tabs.Tab</a>
                       </span>
                     </span>
                   )
@@ -3507,8 +3507,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-Tab"></a>
-              <h4>Tab</h4>
+              <a name="type-tabs.Tab"></a>
+              <h4>tabs.Tab</h4>
               <div>
           <dt>
               <em>