Introduce a separate preference for 'proxy server mode'

chrome/common/extensions/docs/experimental.proxy.html

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 3f97065d505fa2c748b1c025850f31e396f2475b..506199b681f90fdf096e50df07a5336299838738 100644
--- a/chrome/common/extensions/docs/experimental.proxy.html
+++ b/chrome/common/extensions/docs/experimental.proxy.html
@@ -1314,7 +1314,7 @@
               </div><div>
                 <div>
           <dt>
-            <var>autoDetect</var>
+            <var>pacScript</var>
               <em>
 
                 <!-- TYPE -->
@@ -1323,15 +1323,15 @@
                     <span class="optional">optional</span>
                     <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
-                      <span style="display: none; ">
-                        <a> Type</a>
-                      </span>
                       <span>
-                        <span style="display: none; ">
+                        <a href="experimental.proxy.html#type-PacScript">PacScript</a>
+                      </span>
+                      <span style="display: none; ">
+                        <span>
                           array of <span><span></span></span>
                         </span>
-                        <span>boolean</span>
-                        <span style="display: none; "></span>
+                        <span>paramType</span>
+                        <span></span>
                       </span>
                     </span>
                   )
@@ -1342,7 +1342,7 @@
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>True if the proxy settings sbould be detected automatically.</dd>
+          <dd>The proxy auto-config (PAC) script for this configuration.</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
@@ -1372,24 +1372,24 @@
               </div><div>
                 <div>
           <dt>
-            <var>pacScript</var>
+            <var>mode</var>
               <em>
 
                 <!-- TYPE -->
                 <div style="display:inline">
                   (
-                    <span class="optional">optional</span>
-                    <span class="enum" style="display: none; ">enumerated</span>
+                    <span class="optional" style="display: none; ">optional</span>
+                    <span class="enum">enumerated</span>
                     <span id="typeTemplate">
-                      <span>
-                        <a href="experimental.proxy.html#type-PacScript">PacScript</a>
-                      </span>
                       <span style="display: none; ">
-                        <span>
+                        <a> Type</a>
+                      </span>
+                      <span>
+                        <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>paramType</span>
-                        <span></span>
+                        <span>string</span>
+                        <span>["disabled", "auto_detect", "pac_script", "fixed_servers", "system"]</span>
                       </span>
                     </span>
                   )
@@ -1400,7 +1400,7 @@
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>The proxy auto-config (PAC) script for this configuration.</dd>
+          <dd>'disabled' = Never use a proxy<br>'auto_detect' = Auto detect proxy settings<br>'pac_script' = Use specified PAC script<br>'fixed_servers' = Manually specify proxy servers<br>'system' = Use system proxy settings</dd>

[Mattias Nissler (ping if slow), 2010/12/22 10:22:12]

should we rename the strings here as well, i.e. disabled->direct so they agree
with what we have in the code after you made the naming changes eroman
suggested?

[battre, 2010/12/22 14:41:16]

Done.

           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.