Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/fileBrowserHandler.html

Index: chrome/common/extensions/docs/fileBrowserHandler.html
===================================================================
--- chrome/common/extensions/docs/fileBrowserHandler.html	(revision 151318)
+++ chrome/common/extensions/docs/fileBrowserHandler.html	(working copy)
@@ -225,7 +225,7 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-FileHandlerExecuteEventDetails">null</a>
+                <a href="#type-fileBrowserHandler.FileHandlerExecuteEventDetails">FileHandlerExecuteEventDetails</a>
                 <ol>
                 </ol>
               </li>
@@ -490,7 +490,7 @@
               <h4>onExecute</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.fileBrowserHandler.</span><span>onExecute</span><span class="subdued">.addListener</span>(function(<span>string id, FileHandlerExecuteEventDetails details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.fileBrowserHandler.</span><span>onExecute</span><span class="subdued">.addListener</span>(function(<span>string id, fileBrowserHandler.FileHandlerExecuteEventDetails details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when file system action is executed from ChromeOS file browser.</p>
@@ -531,7 +531,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="fileBrowserHandler.html#type-FileHandlerExecuteEventDetails">FileHandlerExecuteEventDetails</a>
+                        <a href="fileBrowserHandler.html#type-fileBrowserHandler.FileHandlerExecuteEventDetails">fileBrowserHandler.FileHandlerExecuteEventDetails</a>
                       </span>
                     </span>
                   )
@@ -561,8 +561,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-FileHandlerExecuteEventDetails"></a>
-              <h4>FileHandlerExecuteEventDetails</h4>
+              <a name="type-fileBrowserHandler.FileHandlerExecuteEventDetails"></a>
+              <h4>fileBrowserHandler.FileHandlerExecuteEventDetails</h4>
               <div>
           <dt>
               <em>