Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(870)

Unified Diff: chrome/common/extensions/docs/experimental.proxy.html

Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/out/Debug
Patch Set: Fixed Lint comment Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/api/extension_api.json ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/docs/experimental.proxy.html
diff --git a/chrome/common/extensions/docs/experimental.proxy.html b/chrome/common/extensions/docs/experimental.proxy.html
index eb32de71e313e1ce030f901fdd675bc607223039..c6c888239d2c48f3d82c847ac680e1db9842398e 100644
--- a/chrome/common/extensions/docs/experimental.proxy.html
+++ b/chrome/common/extensions/docs/experimental.proxy.html
@@ -1033,7 +1033,7 @@
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>An object encapsulating the set of proxy rules for all protocols.</dd>
+ <dd>An object encapsulating the set of proxy rules for all protocols. Use either 'singleProxy' or (a subset of) 'proxyForHttp', 'proxyForHttps', 'proxyForFtp' and 'socksProxy'.</dd>
<dd style="display: none; ">
This parameter was added in version
<b><span></span></b>.
@@ -1624,7 +1624,7 @@
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The proxy rules describing this configuration.</dd>
+ <dd>The proxy rules describing this configuration. Use this for 'fixed_servers' mode.</dd>
<dd style="display: none; ">
This parameter was added in version
<b><span></span></b>.
@@ -1692,7 +1692,7 @@
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The proxy auto-config (PAC) script for this configuration.</dd>
+ <dd>The proxy auto-config (PAC) script for this configuration. Use this for 'pac_script' mode.</dd>
<dd style="display: none; ">
This parameter was added in version
<b><span></span></b>.
« no previous file with comments | « chrome/common/extensions/api/extension_api.json ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698