| Index: chrome/common/extensions/docs/server2/templates/intros/types.html
|
| diff --git a/chrome/common/extensions/docs/server2/templates/intros/types.html b/chrome/common/extensions/docs/server2/templates/intros/types.html
|
| index 3dc9dc5fb90a50e8985d9728b94d36839caa6b13..a2c11715794777e4b9ad57d91d8cc355e0197679 100644
|
| --- a/chrome/common/extensions/docs/server2/templates/intros/types.html
|
| +++ b/chrome/common/extensions/docs/server2/templates/intros/types.html
|
| @@ -1,4 +1,3 @@
|
| -<!-- BEGIN AUTHORED CONTENT -->
|
| <p id="classSummary">
|
| The <code>chrome.types</code> module contains type declarations for Chrome.
|
| Currently this comprises only a prototype for giving other
|
| @@ -6,9 +5,7 @@ modules access to manage Chrome browser settings. This prototype is used,
|
| for example, for <a
|
| href="proxy.html#property-settings"><code>chrome.proxy.settings</code></a>.
|
| </p>
|
| -
|
| <h2 id="ChromeSetting">Chrome settings</h2>
|
| -
|
| <p>
|
| The <code>ChromeSetting</code> prototype provides a common set of functions
|
| (<code>get()</code>, <code>set()</code>, and <code>clear()</code>) as
|
| @@ -16,9 +13,7 @@ well as an event publisher (<code>onChange</code>) for settings of the
|
| Chrome browser. The <a href="proxy.html#overview-examples">proxy settings
|
| examples</a> demonstrate how these functions are intended to be used.
|
| </p>
|
| -
|
| <h3 id="ChromeSetting-lifecycle">Scope and life cycle</h3>
|
| -
|
| <p>
|
| Chrome distinguishes between three different scopes of browser settings:
|
| <dl>
|
| @@ -28,26 +23,21 @@ Chrome distinguishes between three different scopes of browser settings:
|
| overwritten. These settings are stored to disk and remain in place until
|
| they are cleared by the governing extension, or the governing extension is
|
| disabled or uninstalled.</dd>
|
| -
|
| <dt><code>incognito_persistent</code></dt>
|
| <dd>Settings set in the <code>incognito_persistent</code> scope apply only
|
| to incognito windows. For these, they override <code>regular</code>
|
| settings. These settings are stored to disk and remain in place until
|
| they are cleared by the governing extension, or the governing extension is
|
| disabled or uninstalled.</dd>
|
| -
|
| <dt><code>incognito_session_only</code></dt>
|
| <dd>Settings set in the <code>incognito_session_only</code> scope apply only
|
| to incognito windows. For these, they override <code>regular</code> and
|
| <code>incognito_session_only</code> settings. These settings are not
|
| stored to disk and are cleared when the last incognito window is closed. They
|
| can only be set when at least one incognito window is open.</dd>
|
| -
|
| </dl>
|
| </p>
|
| -
|
| <h3 id="ChromeSetting-precedence">Precedence</h3>
|
| -
|
| <p>
|
| Chrome manages settings on different layers. The following list describes the
|
| layers that may influence the effective settings, in increasing order of
|
| @@ -59,14 +49,12 @@ precedence.
|
| <li>Policies</li>
|
| </ol>
|
| </p>
|
| -
|
| <p>
|
| As the list implies, policies might overrule any changes that you specify with
|
| your extension. You can use the <code>get()</code> function to determine whether
|
| your extension is capable of providing a setting or whether this setting would
|
| be overridden.
|
| </p>
|
| -
|
| <p>
|
| As discussed above, Chrome allows using different settings for regular
|
| windows and incognito windows. The following example illustrates the behavior.
|
| @@ -74,7 +62,6 @@ Assume that no policy overrides the settings and that an extension can set
|
| settings for regular windows <b>(R)</b> and settings for incognito windows
|
| <b>(I)</b>.
|
| </p>
|
| -
|
| <p>
|
| <ul>
|
| <li>If only <b>(R)</b> is set, these settings are effective for both
|
| @@ -86,16 +73,13 @@ settings for regular windows <b>(R)</b> and settings for incognito windows
|
| used for regular and incognito windows.</li>
|
| </ul>
|
| </p>
|
| -
|
| <p>
|
| If two or more extensions want to set the same setting to different values,
|
| the extension installed most recently takes precedence over the other
|
| extensions. If the most recently installed extension sets only <b>(I)</b>, the
|
| settings of regular windows can be defined by previously installed extensions.
|
| </p>
|
| -
|
| <p>
|
| The <em>effective</em> value of a setting is the one that results from
|
| considering the precedence rules. It is used by Chrome.
|
| -<p>
|
| -<!-- END AUTHORED CONTENT -->
|
| +<p>
|
|
|