Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/browserAction.html

Index: chrome/common/extensions/docs/browserAction.html
===================================================================
--- chrome/common/extensions/docs/browserAction.html	(revision 151318)
+++ chrome/common/extensions/docs/browserAction.html	(working copy)
@@ -258,7 +258,7 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-ColorArray">null</a>
+                <a href="#type-browserAction.ColorArray">ColorArray</a>
                 <ol>
                 </ol>
               </li>
@@ -871,7 +871,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <span>string or ColorArray</span>
+                        <span>string or browserAction.ColorArray</span>
                       </span>
                     </span>
                   )
@@ -1393,7 +1393,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a>tabs.Tab</a>
+                        <a href="tabs.html#type-tabs.Tab">tabs.Tab</a>
                       </span>
                     </span>
                   )
@@ -1425,8 +1425,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-ColorArray"></a>
-              <h4>ColorArray</h4>
+              <a name="type-browserAction.ColorArray"></a>
+              <h4>browserAction.ColorArray</h4>
               <div>
           <dt>
               <em>