Policy: Add ProxyMode and deprecate ProxyServerMode.

tools/grit/grit/format/policy_templates/writers/adml_writer.py

Index: tools/grit/grit/format/policy_templates/writers/adml_writer.py
diff --git a/tools/grit/grit/format/policy_templates/writers/adml_writer.py b/tools/grit/grit/format/policy_templates/writers/adml_writer.py
index e656dfd3ab4aaa34df1ef33d07b4917c7bb48f36..63ca64b96ce5f56a1c1cb479346cc18689369671 100644
--- a/tools/grit/grit/format/policy_templates/writers/adml_writer.py
+++ b/tools/grit/grit/format/policy_templates/writers/adml_writer.py
@@ -87,7 +87,13 @@ class ADMLWriter(xml_formatted_writer.XMLFormattedWriter):
                                      {'refId': policy_name})
       label_elem = self.AddElement(textbox_elem, 'label')
       label_elem.appendChild(self._doc.createTextNode(policy_label))
-    elif policy_type == 'enum':
+    elif policy_type == 'int-enum':

[gfeher, 2011/01/03 10:30:10]

Please merge the handling of 'int-enum' and 'string-enum'.

[danno, 2011/01/07 12:24:25]

Done.

+      for item in policy['items']:
+        self._AddString(self._string_table_elem, item['name'], item['caption'])
+      dropdownlist_elem = self.AddElement(presentation_elem, 'dropdownList',
+                                          {'refId': policy_name})
+      dropdownlist_elem.appendChild(self._doc.createTextNode(policy_label))
+    elif policy_type == 'string-enum':
       for item in policy['items']:
         self._AddString(self._string_table_elem, item['name'], item['caption'])
       dropdownlist_elem = self.AddElement(presentation_elem, 'dropdownList',