Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/bookmarks.html

Index: chrome/common/extensions/docs/bookmarks.html
===================================================================
--- chrome/common/extensions/docs/bookmarks.html	(revision 151318)
+++ chrome/common/extensions/docs/bookmarks.html	(working copy)
@@ -261,7 +261,7 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-BookmarkTreeNode">null</a>
+                <a href="#type-bookmarks.BookmarkTreeNode">BookmarkTreeNode</a>
                 <ol>
                 </ol>
               </li>
@@ -1637,7 +1637,7 @@
               <h4>onCreated</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.bookmarks.</span><span>onCreated</span><span class="subdued">.addListener</span>(function(<span>string id, BookmarkTreeNode bookmark</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.bookmarks.</span><span>onCreated</span><span class="subdued">.addListener</span>(function(<span>string id, bookmarks.BookmarkTreeNode bookmark</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a bookmark or folder is created.</p>
@@ -1680,7 +1680,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="bookmarks.html#type-BookmarkTreeNode">BookmarkTreeNode</a>
+                        <a href="bookmarks.html#type-bookmarks.BookmarkTreeNode">bookmarks.BookmarkTreeNode</a>
                       </span>
                     </span>
                   )
@@ -2048,8 +2048,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-BookmarkTreeNode"></a>
-              <h4>BookmarkTreeNode</h4>
+              <a name="type-bookmarks.BookmarkTreeNode"></a>
+              <h4>bookmarks.BookmarkTreeNode</h4>
               <div>
           <dt>
               <em>
@@ -2249,7 +2249,7 @@
                         <span>
                           array of <span><span>
                       <span>
-                        <a href="bookmarks.html#type-BookmarkTreeNode">BookmarkTreeNode</a>
+                        <a href="bookmarks.html#type-bookmarks.BookmarkTreeNode">bookmarks.BookmarkTreeNode</a>
                       </span>
                     </span></span>
                         </span>