Support persistent incognito preferences

chrome/common/extensions/docs/preferences.html

Index: chrome/common/extensions/docs/preferences.html
diff --git a/chrome/common/extensions/docs/preferences.html b/chrome/common/extensions/docs/preferences.html
index 657ed20cd3dc5c25262e98324052b58c3e0561a9..d27ee3de8829429e7cdd20d6a493b9a2826ed087 100644
--- a/chrome/common/extensions/docs/preferences.html
+++ b/chrome/common/extensions/docs/preferences.html
@@ -258,7 +258,14 @@
           <h2>Contents</h2>
           <ol>
             <li>
-              <a href="#description">Overview</a>
+              <a href="#description">Functions</a>
+              <ol>
+                <li style="display: none; ">
+                  <a>h3Name</a>
+                </li>
+              </ol>
+            </li><li>
+              <a href="#lifecycle">Life cycle of preferences</a>
               <ol>
                 <li style="display: none; ">
                   <a>h3Name</a>
@@ -324,30 +331,29 @@
 <!-- BEGIN AUTHORED CONTENT -->
 <p id="classSummary">
 The <code>chrome.preferences</code> module contains a prototype for giving other
-modules access to manage preferences stored by Chrome. This prototype is used
-for example for <a href="proxy.html#property-settings"><code>chrome.proxy.settings</code></a>.
+modules access to manage Chrome's preferences. This prototype is used for
+example for <a href="proxy.html#property-settings"><code>chrome.proxy.settings</code></a>.
 </p>
 
-<h2 id="description">Overview</h2>
+<h2 id="description">Functions</h2>
 
 <p>
-The preferences API provides a common set of functions
+The preferences API provides a commen set of functions
 (<code>getEffective()</code>, <code>set()</code>, and <code>clear()</code>) as
 well as an event publisher (<code>onChangeEffective</code>) for various
 preferences in Chrome. The <a href="proxy.html#overview-examples">proxy settings
  examples</a> demonstrate how these functions are intended to be used.
 </p>
 
-<!--
 <h2 id="lifecycle">Life cycle of preferences</h2>
 
 <p>
 The life cycle of preferences depends on whether they are set for regular or
-incognito profiles. </p>
--->
+incognito profiles. Currently, preferences can only be set for regular profiles.
+</p>
 
 <p>
-Currently, preferences can only be set for regular profiles. Once set, they
+Preferences for <em>regular profiles</em> are persisted to disk. Once set, they
 remain in place until they are cleared by the governing extension, or the
 governing extension is disabled or uninstalled.
 </p>
@@ -360,7 +366,7 @@ layers that may influence the effective preferences, in increasing order of
 precedence.
 </p><ol>
   <li>System preferences provided by the operating system</li>
-  <li>Command-line parameters</li>
+  <li>Command line parameters</li>
   <li>Preferences set by extensions</li>
   <li>Policies</li>
 </ol>
@@ -394,9 +400,8 @@ preferences for regular windows <b>(R)</b> and preferences for incognito windows
 -->
 
 <p>
-If two or more extensions want to set the same preference to different values,
-the extension installed most recently takes precedence over the other
-extensions.
+If two extensions want to set the same preference to different values, the
+extension installed last takes precedence over the other extensions.
 <!-- If the
 extension installed last sets only <b>(I)</b>, the preference of regular windows
 can be defined by previously installed extensions. -->
@@ -715,7 +720,7 @@ considering the preference rules. It is used by Chrome.
                           array of <span><span></span></span>
                         </span>
                         <span>string</span>
-                        <span>["regular"]</span>
+                        <span>["regular", "incognito_persistent"]</span>
                       </span>
                     </span>
                   )
@@ -726,7 +731,7 @@ considering the preference rules. It is used by Chrome.
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>Where to clear the preference (default: regular). 'regular' = preference for regular profile (which is inherited by the incognito profile if not overridden elsewhere).</dd>
+          <dd>Where to set the preference (default: regular). 'regular' = preference for regular profile (which is inherited by the incognito profile if not overridden elsewhere), 'incognito_persistent' = preference for incognito profile that sustains browser restarts (overrides regular preferences).</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
@@ -1577,7 +1582,7 @@ considering the preference rules. It is used by Chrome.
                           array of <span><span></span></span>
                         </span>
                         <span>string</span>
-                        <span>["regular"]</span>
+                        <span>["regular", "incognito_persistent"]</span>
                       </span>
                     </span>
                   )
@@ -1588,7 +1593,7 @@ considering the preference rules. It is used by Chrome.
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>Where to set the preference (default: regular). 'regular' = preference for regular profile (which is inherited by the incognito profile if not overridden elsewhere).</dd>
+          <dd>Where to set the preference (default: regular). 'regular' = preference for regular profile (which is inherited by the incognito profile if not overridden elsewhere), 'incognito_persistent' = preference for incognito profile that sustains browser restarts (overrides regular preferences).</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.