Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/experimental.speechInput.html

Index: chrome/common/extensions/docs/experimental.speechInput.html
===================================================================
--- chrome/common/extensions/docs/experimental.speechInput.html	(revision 151318)
+++ chrome/common/extensions/docs/experimental.speechInput.html	(working copy)
@@ -251,19 +251,19 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-SpeechInputStartOptions">null</a>
+                <a href="#type-experimental.speechInput.SpeechInputStartOptions">SpeechInputStartOptions</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-SpeechInputError">null</a>
+                <a href="#type-experimental.speechInput.SpeechInputError">SpeechInputError</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-SpeechInputResultHypothesis">null</a>
+                <a href="#type-experimental.speechInput.SpeechInputResultHypothesis">SpeechInputResultHypothesis</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-SpeechInputResultEvent">null</a>
+                <a href="#type-experimental.speechInput.SpeechInputResultEvent">SpeechInputResultEvent</a>
                 <ol>
                 </ol>
               </li>
@@ -423,7 +423,7 @@
               <h4>start</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.experimental.speechInput.start</span>(<span class="optional"><span>SpeechInputStartOptions</span>
+                  <span>chrome.experimental.speechInput.start</span>(<span class="optional"><span>experimental.speechInput.SpeechInputStartOptions</span>
                       <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -442,7 +442,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.speechInput.html#type-SpeechInputStartOptions">SpeechInputStartOptions</a>
+                        <a href="experimental.speechInput.html#type-experimental.speechInput.SpeechInputStartOptions">experimental.speechInput.SpeechInputStartOptions</a>
                       </span>
                     </span>
                   )
@@ -543,7 +543,7 @@
               <h4>onError</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.speechInput.</span><span>onError</span><span class="subdued">.addListener</span>(function(<span>SpeechInputError error</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.experimental.speechInput.</span><span>onError</span><span class="subdued">.addListener</span>(function(<span>experimental.speechInput.SpeechInputError error</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Called in case of an error in speech recognition.</p>
@@ -561,7 +561,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.speechInput.html#type-SpeechInputError">SpeechInputError</a>
+                        <a href="experimental.speechInput.html#type-experimental.speechInput.SpeechInputError">experimental.speechInput.SpeechInputError</a>
                       </span>
                     </span>
                   )
@@ -588,7 +588,7 @@
               <h4>onResult</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.speechInput.</span><span>onResult</span><span class="subdued">.addListener</span>(function(<span>SpeechInputResultEvent event</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.experimental.speechInput.</span><span>onResult</span><span class="subdued">.addListener</span>(function(<span>experimental.speechInput.SpeechInputResultEvent event</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Called when speech recognition results are available.</p>
@@ -606,7 +606,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.speechInput.html#type-SpeechInputResultEvent">SpeechInputResultEvent</a>
+                        <a href="experimental.speechInput.html#type-experimental.speechInput.SpeechInputResultEvent">experimental.speechInput.SpeechInputResultEvent</a>
                       </span>
                     </span>
                   )
@@ -668,8 +668,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-SpeechInputStartOptions"></a>
-              <h4>SpeechInputStartOptions</h4>
+              <a name="type-experimental.speechInput.SpeechInputStartOptions"></a>
+              <h4>experimental.speechInput.SpeechInputStartOptions</h4>
               <div>
           <dt>
               <em>
@@ -769,8 +769,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-SpeechInputError"></a>
-              <h4>SpeechInputError</h4>
+              <a name="type-experimental.speechInput.SpeechInputError"></a>
+              <h4>experimental.speechInput.SpeechInputError</h4>
               <div>
           <dt>
               <em>
@@ -823,8 +823,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-SpeechInputResultHypothesis"></a>
-              <h4>SpeechInputResultHypothesis</h4>
+              <a name="type-experimental.speechInput.SpeechInputResultHypothesis"></a>
+              <h4>experimental.speechInput.SpeechInputResultHypothesis</h4>
               <div>
           <dt>
               <em>
@@ -898,8 +898,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-SpeechInputResultEvent"></a>
-              <h4>SpeechInputResultEvent</h4>
+              <a name="type-experimental.speechInput.SpeechInputResultEvent"></a>
+              <h4>experimental.speechInput.SpeechInputResultEvent</h4>
               <div>
           <dt>
               <em>
@@ -933,7 +933,7 @@
                         <span>
                           array of <span><span>
                       <span>
-                        <a href="experimental.speechInput.html#type-SpeechInputResultHypothesis">SpeechInputResultHypothesis</a>
+                        <a href="experimental.speechInput.html#type-experimental.speechInput.SpeechInputResultHypothesis">experimental.speechInput.SpeechInputResultHypothesis</a>
                       </span>
                     </span></span>
                         </span>