Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/storage.html

Index: chrome/common/extensions/docs/storage.html
===================================================================
--- chrome/common/extensions/docs/storage.html	(revision 151318)
+++ chrome/common/extensions/docs/storage.html	(working copy)
@@ -235,25 +235,25 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-StorageChange">null</a>
+                <a href="#type-storage.StorageChange">StorageChange</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-StorageArea">null</a>
+                <a href="#type-storage.StorageArea">StorageArea</a>
                 <ol>
                   <li>
-            <a href="#global-StorageArea-methods">Methods</a>
+            <a href="#global-storage.StorageArea-methods">Methods</a>
             <ol>
               <li>
-                <a href="#method-StorageArea-clear">clear</a>
+                <a href="#method-storage.StorageArea-clear">clear</a>
               </li><li>
-                <a href="#method-StorageArea-get">get</a>
+                <a href="#method-storage.StorageArea-get">get</a>
               </li><li>
-                <a href="#method-StorageArea-getBytesInUse">getBytesInUse</a>
+                <a href="#method-storage.StorageArea-getBytesInUse">getBytesInUse</a>
               </li><li>
-                <a href="#method-StorageArea-remove">remove</a>
+                <a href="#method-storage.StorageArea-remove">remove</a>
               </li><li>
-                <a href="#method-StorageArea-set">set</a>
+                <a href="#method-storage.StorageArea-set">set</a>
               </li>
             </ol>
           </li>
@@ -416,7 +416,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="storage.html#type-StorageArea">StorageArea</a>
+                        <a href="storage.html#type-storage.StorageArea">storage.StorageArea</a>
                       </span>
                     </span>
                   )
@@ -555,7 +555,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="storage.html#type-StorageArea">StorageArea</a>
+                        <a href="storage.html#type-storage.StorageArea">storage.StorageArea</a>
                       </span>
                     </span>
                   )
@@ -679,8 +679,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-StorageChange"></a>
-              <h4>StorageChange</h4>
+              <a name="type-storage.StorageChange"></a>
+              <h4>storage.StorageChange</h4>
               <div>
           <dt>
               <em>
@@ -758,8 +758,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-StorageArea"></a>
-              <h4>StorageArea</h4>
+              <a name="type-storage.StorageArea"></a>
+              <h4>storage.StorageArea</h4>
               <div>
           <dt>
               <em>
@@ -782,15 +782,15 @@
           <!-- OBJECT METHODS -->
           <dd>
             <div class="apiGroup">
-            <a name="global-StorageArea-methods"></a>
-            <h3>Methods of StorageArea</h3>
+            <a name="global-storage.StorageArea-methods"></a>
+            <h3>Methods of storage.StorageArea</h3>
             <!-- iterates over all functions -->
             <div class="apiItem">
-              <a name="method-StorageArea-clear"></a> <!-- method-anchor -->
+              <a name="method-storage.StorageArea-clear"></a> <!-- method-anchor -->
               <h4>clear</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>storageArea.clear</span>(<span class="optional"><span>function</span>
+                  <span>storage.StorageArea.clear</span>(<span class="optional"><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
                 <p>Removes all items from storage.</p>
@@ -830,11 +830,11 @@
                 <!-- MIN_VERSION -->
               </div> <!-- /description -->
             </div><div class="apiItem">
-              <a name="method-StorageArea-get"></a> <!-- method-anchor -->
+              <a name="method-storage.StorageArea-get"></a> <!-- method-anchor -->
               <h4>get</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>storageArea.get</span>(<span class="optional"><span>string or array of string or object</span>
+                  <span>storage.StorageArea.get</span>(<span class="optional"><span>string or array of string or object</span>
                       <var><span>keys</span></var></span><span class="null"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -898,11 +898,11 @@
                 <!-- MIN_VERSION -->
               </div> <!-- /description -->
             </div><div class="apiItem">
-              <a name="method-StorageArea-getBytesInUse"></a> <!-- method-anchor -->
+              <a name="method-storage.StorageArea-getBytesInUse"></a> <!-- method-anchor -->
               <h4>getBytesInUse</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>storageArea.getBytesInUse</span>(<span class="optional"><span>string or array of string</span>
+                  <span>storage.StorageArea.getBytesInUse</span>(<span class="optional"><span>string or array of string</span>
                       <var><span>keys</span></var></span><span class="null"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -966,11 +966,11 @@
                 <!-- MIN_VERSION -->
               </div> <!-- /description -->
             </div><div class="apiItem">
-              <a name="method-StorageArea-remove"></a> <!-- method-anchor -->
+              <a name="method-storage.StorageArea-remove"></a> <!-- method-anchor -->
               <h4>remove</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>storageArea.remove</span>(<span class="null"><span>string or array of string</span>
+                  <span>storage.StorageArea.remove</span>(<span class="null"><span>string or array of string</span>
                       <var><span>keys</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -1034,11 +1034,11 @@
                 <!-- MIN_VERSION -->
               </div> <!-- /description -->
             </div><div class="apiItem">
-              <a name="method-StorageArea-set"></a> <!-- method-anchor -->
+              <a name="method-storage.StorageArea-set"></a> <!-- method-anchor -->
               <h4>set</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>storageArea.set</span>(<span class="null"><span>object</span>
+                  <span>storage.StorageArea.set</span>(<span class="null"><span>object</span>
                       <var><span>items</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">