Options2: Pull the trigger.

chrome/browser/resources/options2/autofill_options.html

Index: chrome/browser/resources/options2/autofill_options.html
diff --git a/chrome/browser/resources/options2/autofill_options.html b/chrome/browser/resources/options2/autofill_options.html
new file mode 100644
index 0000000000000000000000000000000000000000..bfbd175b1c0155be7d972b73ba284dde4532c6a7
--- /dev/null
+++ b/chrome/browser/resources/options2/autofill_options.html
@@ -0,0 +1,38 @@
+<div id="autofill-options" class="page" hidden>
+  <h1 i18n-content="autofillOptionsPage"></h1>
+<if expr="os == 'darwin'">
+  <div class="checkbox">
+    <label>
+      <input pref="autofill.auxiliary_profiles_enabled" type="checkbox"
+           metric="Options_AutofillAuxiliaryProfiles">
+      <span i18n-content="auxiliaryProfilesEnabled"></span>
+    </label>
+  </div>
+</if>
+  <h3 i18n-content="autofillAddresses"></h3>
+  <div class="settings-list">
+    <list id="address-list"></list>
+    <div>
+      <button id="autofill-add-address" i18n-content="autofillAddAddress">
+      </button>
+    </div>
+  </div>
+  <h3 i18n-content="autofillCreditCards"></h3>
+  <div class="settings-list">
+    <list id="creditcard-list"></list>
+    <div>
+      <button id="autofill-add-creditcard"
+          i18n-content="autofillAddCreditCard"></button>
+    </div>
+  </div>
+  <div>
+<if expr="pp_ifdef('chromeos')">
+    <a href="https://www.google.com/support/chromeos/bin/answer.py?answer=142893"
+        target="_blank" i18n-content="helpButton"></a>
+</if>
+<if expr="not pp_ifdef('chromeos')">
+    <a href="https://www.google.com/support/chrome/bin/answer.py?answer=142893"
+        target="_blank" i18n-content="helpButton"></a>
+</if>
+  </div>
+</div>