Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/experimental.devtools.console.html

Index: chrome/common/extensions/docs/experimental.devtools.console.html
===================================================================
--- chrome/common/extensions/docs/experimental.devtools.console.html	(revision 151318)
+++ chrome/common/extensions/docs/experimental.devtools.console.html	(working copy)
@@ -220,11 +220,11 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-ConsoleMessage">null</a>
+                <a href="#type-experimental.devtools.console.ConsoleMessage">ConsoleMessage</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-Severity">null</a>
+                <a href="#type-experimental.devtools.console.Severity">Severity</a>
                 <ol>
                 </ol>
               </li>
@@ -268,7 +268,7 @@
               <h4>addMessage</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.experimental.devtools.console.addMessage</span>(<span class="null"><span>Severity</span>
+                  <span>chrome.experimental.devtools.console.addMessage</span>(<span class="null"><span>experimental.devtools.console.Severity</span>
                       <var><span>severity</span></var></span><span class="null"><span>, </span><span>string</span>
                       <var><span>text</span></var></span>)</div>
               <div class="description">
@@ -286,7 +286,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.devtools.console.html#type-Severity">Severity</a>
+                        <a href="experimental.devtools.console.html#type-experimental.devtools.console.Severity">experimental.devtools.console.Severity</a>
                       </span>
                     </span>
                   )
@@ -385,7 +385,7 @@
               <h4>onMessageAdded</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.experimental.devtools.console.</span><span>onMessageAdded</span><span class="subdued">.addListener</span>(function(<span>ConsoleMessage message</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.experimental.devtools.console.</span><span>onMessageAdded</span><span class="subdued">.addListener</span>(function(<span>experimental.devtools.console.ConsoleMessage message</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when a new message is added to the console.</p>
@@ -403,7 +403,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.devtools.console.html#type-ConsoleMessage">ConsoleMessage</a>
+                        <a href="experimental.devtools.console.html#type-experimental.devtools.console.ConsoleMessage">experimental.devtools.console.ConsoleMessage</a>
                       </span>
                     </span>
                   )
@@ -435,8 +435,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-ConsoleMessage"></a>
-              <h4>ConsoleMessage</h4>
+              <a name="type-experimental.devtools.console.ConsoleMessage"></a>
+              <h4>experimental.devtools.console.ConsoleMessage</h4>
               <div>
           <dt>
               <em>
@@ -466,7 +466,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.devtools.console.html#type-Severity">Severity</a>
+                        <a href="experimental.devtools.console.html#type-experimental.devtools.console.Severity">experimental.devtools.console.Severity</a>
                       </span>
                     </span>
                   )
@@ -558,8 +558,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-Severity"></a>
-              <h4>Severity</h4>
+              <a name="type-experimental.devtools.console.Severity"></a>
+              <h4>experimental.devtools.console.Severity</h4>
               <div>
           <dt>
               <em>