Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/contextMenus.html

Index: chrome/common/extensions/docs/contextMenus.html
===================================================================
--- chrome/common/extensions/docs/contextMenus.html	(revision 151318)
+++ chrome/common/extensions/docs/contextMenus.html	(working copy)
@@ -231,7 +231,7 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-OnClickData">null</a>
+                <a href="#type-contextMenus.OnClickData">OnClickData</a>
                 <ol>
                 </ol>
               </li>
@@ -515,7 +515,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="contextMenus.html#type-OnClickData">OnClickData</a>
+                        <a href="contextMenus.html#type-contextMenus.OnClickData">contextMenus.OnClickData</a>
                       </span>
                     </span>
                   )
@@ -538,7 +538,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a>tabs.Tab</a>
+                        <a href="tabs.html#type-tabs.Tab">tabs.Tab</a>
                       </span>
                     </span>
                   )
@@ -1201,7 +1201,7 @@
               <h4>onClicked</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.contextMenus.</span><span>onClicked</span><span class="subdued">.addListener</span>(function(<span>OnClickData info, tabs.Tab tab</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.contextMenus.</span><span>onClicked</span><span class="subdued">.addListener</span>(function(<span>contextMenus.OnClickData info, tabs.Tab tab</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a context menu item is clicked.</p>
@@ -1219,7 +1219,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="contextMenus.html#type-OnClickData">OnClickData</a>
+                        <a href="contextMenus.html#type-contextMenus.OnClickData">contextMenus.OnClickData</a>
                       </span>
                     </span>
                   )
@@ -1242,7 +1242,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a>tabs.Tab</a>
+                        <a href="tabs.html#type-tabs.Tab">tabs.Tab</a>
                       </span>
                     </span>
                   )
@@ -1272,8 +1272,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-OnClickData"></a>
-              <h4>OnClickData</h4>
+              <a name="type-contextMenus.OnClickData"></a>
+              <h4>contextMenus.OnClickData</h4>
               <div>
           <dt>
               <em>