Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/management.html

Index: chrome/common/extensions/docs/management.html
===================================================================
--- chrome/common/extensions/docs/management.html	(revision 151318)
+++ chrome/common/extensions/docs/management.html	(working copy)
@@ -239,11 +239,11 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-IconInfo">null</a>
+                <a href="#type-management.IconInfo">IconInfo</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-ExtensionInfo">null</a>
+                <a href="#type-management.ExtensionInfo">ExtensionInfo</a>
                 <ol>
                 </ol>
               </li>
@@ -321,7 +321,7 @@
                 </div>
               </em>
           </dt>
-          <dd>The ID from an item of <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>.</dd>
+          <dd>The ID from an item of $ref:ExtensionInfo.</dd>
           <!-- OBJECT PROPERTIES -->
           <!-- OBJECT METHODS -->
           <!-- OBJECT EVENT FIELDS -->
@@ -648,7 +648,7 @@
                 </div>
               </em>
           </dt>
-          <dd>This should be the id from an item of <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>.</dd>
+          <dd>This should be the id from an item of $ref:ExtensionInfo.</dd>
           <!-- OBJECT PROPERTIES -->
           <!-- OBJECT METHODS -->
           <!-- OBJECT EVENT FIELDS -->
@@ -742,7 +742,7 @@
                 </div>
               </em>
           </dt>
-          <dd>This should be the id from an item of <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>.</dd>
+          <dd>This should be the id from an item of $ref:ExtensionInfo.</dd>
           <!-- OBJECT PROPERTIES -->
           <!-- OBJECT METHODS -->
           <!-- OBJECT EVENT FIELDS -->
@@ -849,7 +849,7 @@
               <h4>onDisabled</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.management.</span><span>onDisabled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.management.</span><span>onDisabled</span><span class="subdued">.addListener</span>(function(<span>management.ExtensionInfo info</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when an app or extension has been disabled</p>
@@ -867,7 +867,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>
+                        <a href="management.html#type-management.ExtensionInfo">management.ExtensionInfo</a>
                       </span>
                     </span>
                   )
@@ -896,7 +896,7 @@
               <h4>onEnabled</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.management.</span><span>onEnabled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.management.</span><span>onEnabled</span><span class="subdued">.addListener</span>(function(<span>management.ExtensionInfo info</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when an app or extension has been enabled.</p>
@@ -914,7 +914,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>
+                        <a href="management.html#type-management.ExtensionInfo">management.ExtensionInfo</a>
                       </span>
                     </span>
                   )
@@ -943,7 +943,7 @@
               <h4>onInstalled</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.management.</span><span>onInstalled</span><span class="subdued">.addListener</span>(function(<span>ExtensionInfo info</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.management.</span><span>onInstalled</span><span class="subdued">.addListener</span>(function(<span>management.ExtensionInfo info</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when an app or extension has been installed.</p>
@@ -961,7 +961,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="management.html#type-ExtensionInfo">ExtensionInfo</a>
+                        <a href="management.html#type-management.ExtensionInfo">management.ExtensionInfo</a>
                       </span>
                     </span>
                   )
@@ -1038,8 +1038,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-IconInfo"></a>
-              <h4>IconInfo</h4>
+              <a name="type-management.IconInfo"></a>
+              <h4>management.IconInfo</h4>
               <div>
           <dt>
               <em>
@@ -1113,8 +1113,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-ExtensionInfo"></a>
-              <h4>ExtensionInfo</h4>
+              <a name="type-management.ExtensionInfo"></a>
+              <h4>management.ExtensionInfo</h4>
               <div>
           <dt>
               <em>
@@ -1453,7 +1453,7 @@
                         <span>
                           array of <span><span>
                       <span>
-                        <a href="management.html#type-IconInfo">IconInfo</a>
+                        <a href="management.html#type-management.IconInfo">management.IconInfo</a>
                       </span>
                     </span></span>
                         </span>