Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/types.html

Index: chrome/common/extensions/docs/types.html
===================================================================
--- chrome/common/extensions/docs/types.html	(revision 151318)
+++ chrome/common/extensions/docs/types.html	(working copy)
@@ -210,25 +210,25 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-ChromeSetting">null</a>
+                <a href="#type-types.ChromeSetting">ChromeSetting</a>
                 <ol>
                   <li>
-            <a href="#global-ChromeSetting-methods">Methods</a>
+            <a href="#global-types.ChromeSetting-methods">Methods</a>
             <ol>
               <li>
-                <a href="#method-ChromeSetting-clear">clear</a>
+                <a href="#method-types.ChromeSetting-clear">clear</a>
               </li><li>
-                <a href="#method-ChromeSetting-get">get</a>
+                <a href="#method-types.ChromeSetting-get">get</a>
               </li><li>
-                <a href="#method-ChromeSetting-set">set</a>
+                <a href="#method-types.ChromeSetting-set">set</a>
               </li>
             </ol>
           </li>
                   <li>
-            <a href="#global-ChromeSetting-events">Events</a>
+            <a href="#global-types.ChromeSetting-events">Events</a>
             <ol>
               <li>
-                <a href="#event-ChromeSetting-onChange">onChange</a>
+                <a href="#event-types.ChromeSetting-onChange">onChange</a>
               </li>
             </ol>
           </li>
@@ -347,8 +347,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-ChromeSetting"></a>
-              <h4>ChromeSetting</h4>
+              <a name="type-types.ChromeSetting"></a>
+              <h4>types.ChromeSetting</h4>
               <div>
           <dt>
               <em>
@@ -369,15 +369,15 @@
           <!-- OBJECT METHODS -->
           <dd>
             <div class="apiGroup">
-            <a name="global-ChromeSetting-methods"></a>
-            <h3>Methods of ChromeSetting</h3>
+            <a name="global-types.ChromeSetting-methods"></a>
+            <h3>Methods of types.ChromeSetting</h3>
             <!-- iterates over all functions -->
             <div class="apiItem">
-              <a name="method-ChromeSetting-clear"></a> <!-- method-anchor -->
+              <a name="method-types.ChromeSetting-clear"></a> <!-- method-anchor -->
               <h4>clear</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chromeSetting.clear</span>(<span class="null"><span>object</span>
+                  <span>types.ChromeSetting.clear</span>(<span class="null"><span>object</span>
                       <var><span>details</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -472,11 +472,11 @@
                 <!-- MIN_VERSION -->
               </div> <!-- /description -->
             </div><div class="apiItem">
-              <a name="method-ChromeSetting-get"></a> <!-- method-anchor -->
+              <a name="method-types.ChromeSetting-get"></a> <!-- method-anchor -->
               <h4>get</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chromeSetting.get</span>(<span class="null"><span>object</span>
+                  <span>types.ChromeSetting.get</span>(<span class="null"><span>object</span>
                       <var><span>details</span></var></span><span class="null"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -570,11 +570,11 @@
                 <!-- MIN_VERSION -->
               </div> <!-- /description -->
             </div><div class="apiItem">
-              <a name="method-ChromeSetting-set"></a> <!-- method-anchor -->
+              <a name="method-types.ChromeSetting-set"></a> <!-- method-anchor -->
               <h4>set</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chromeSetting.set</span>(<span class="null"><span>object</span>
+                  <span>types.ChromeSetting.set</span>(<span class="null"><span>object</span>
                       <var><span>details</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -697,15 +697,15 @@
           <!-- OBJECT EVENT FIELDS -->
           <dd>
             <div class="apiGroup">
-            <a name="global-ChromeSetting-events"></a>
-            <h3>Events of ChromeSetting</h3>
+            <a name="global-types.ChromeSetting-events"></a>
+            <h3>Events of types.ChromeSetting</h3>
             <!-- iterates over all events -->
             <div class="apiItem">
-              <a name="event-ChromeSetting-onChange"></a>
+              <a name="event-types.ChromeSetting-onChange"></a>
               <h4>onChange</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chromeSetting.</span><span>onChange</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">types.ChromeSetting.</span><span>onChange</span><span class="subdued">.addListener</span>(function(<span>object details</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when the value of the setting changes.</p>