Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/history.html

Index: chrome/common/extensions/docs/history.html
===================================================================
--- chrome/common/extensions/docs/history.html	(revision 151318)
+++ chrome/common/extensions/docs/history.html	(working copy)
@@ -241,11 +241,11 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-HistoryItem">null</a>
+                <a href="#type-history.HistoryItem">HistoryItem</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-VisitItem">null</a>
+                <a href="#type-history.VisitItem">VisitItem</a>
                 <ol>
                 </ol>
               </li>
@@ -1173,7 +1173,7 @@
               <h4>onVisited</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.history.</span><span>onVisited</span><span class="subdued">.addListener</span>(function(<span>HistoryItem result</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.history.</span><span>onVisited</span><span class="subdued">.addListener</span>(function(<span>history.HistoryItem result</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a URL is visited, providing the HistoryItem data for that URL.  This event fires before the page has loaded.</p>
@@ -1191,7 +1191,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="history.html#type-HistoryItem">HistoryItem</a>
+                        <a href="history.html#type-history.HistoryItem">history.HistoryItem</a>
                       </span>
                     </span>
                   )
@@ -1223,8 +1223,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-HistoryItem"></a>
-              <h4>HistoryItem</h4>
+              <a name="type-history.HistoryItem"></a>
+              <h4>history.HistoryItem</h4>
               <div>
           <dt>
               <em>
@@ -1395,8 +1395,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-VisitItem"></a>
-              <h4>VisitItem</h4>
+              <a name="type-history.VisitItem"></a>
+              <h4>history.VisitItem</h4>
               <div>
           <dt>
               <em>