Clean up managed user settings dialogs.

chrome/browser/resources/options/managed_user_settings.html

Index: chrome/browser/resources/options/managed_user_settings.html
diff --git a/chrome/browser/resources/options/managed_user_settings.html b/chrome/browser/resources/options/managed_user_settings.html
index ea8459d1d30185dc4644c07324d3817cfe24614f..7c065154c67d36005c86a5d33bba1828498cdc79 100644
--- a/chrome/browser/resources/options/managed_user_settings.html
+++ b/chrome/browser/resources/options/managed_user_settings.html
@@ -10,7 +10,6 @@
         <button id="get-content-packs-button" i18n-content="getContentPacks"
             disabled>
         </button>
-        </button>
         <button id="manage-exceptions-button" i18n-content="manageExceptions">
         </button>
       </div>
@@ -22,27 +21,24 @@
         <label>
           <input type="radio" name="contentpacks" value="0"
               id="contentpacks-allow"
-              pref="profile.managed.default_filtering_behavior" dialog-pref>
-          <span for="contentpacks-allow"
-              i18n-content="outsideContentPacksAllow"></span>
+              pref="profile.managed.default_filtering_behavior">
+          <span i18n-content="outsideContentPacksAllow"></span>
         </label>
       </div>
       <div class="radio">
         <label>
           <input type="radio" name="contentpacks" value="1"
               id="contentpacks-warn"
-              pref="profile.managed.default_filtering_behavior" dialog-pref>
-          <span for="contentpacks-warn"
-              i18n-content="outsideContentPacksWarn"></span>
+              pref="profile.managed.default_filtering_behavior">
+          <span i18n-content="outsideContentPacksWarn"></span>
         </label>
       </div>
       <div class="radio">
         <label>
           <input type="radio" name="contentpacks" value="2"
               id="contentpacks-block"
-              pref="profile.managed.default_filtering_behavior" dialog-pref>
-          <span for="contentpacks-block"
-              i18n-content="outsideContentPacksBlock"></span>
+              pref="profile.managed.default_filtering_behavior">
+          <span i18n-content="outsideContentPacksBlock"></span>
         </label>
       </div>
     </section>
@@ -52,39 +48,13 @@
       <div class="checkbox">
         <label>
           <input type="checkbox" id="safe-search-checkbox"
-              pref="settings.force_safesearch" dialog-pref>
-          <span for="safe-search-checkbox"
-              i18n-content="enableSafeSearch"></span>
-        </label>
-      </div>
-      <div class="checkbox">
-        <label>
-          <input id="allow-signin-checkbox" type="checkbox"
-              pref="signin.allowed" dialog-pref>
-          <span for="allow-signin-checkbox"
-              i18n-content="allowSignIn"></span>
+              pref="settings.force_safesearch">
+          <span i18n-content="enableSafeSearch"></span>
         </label>
       </div>
-      <div class="checkbox">
-        <label>
-          <input id="disable-history-deletion-checkbox" type="checkbox"
-              disabled>
-          <span for="disable-history-deletion-checkbox"
-              i18n-content="disableHistoryDeletion"></span>
-        </label>
+      <div class="settings-row">
+        <button id="set-passphrase" i18n-content="setPassphrase"></button>
       </div>
-      <if expr="not pp_ifdef('chromeos')">
-        <div class="checkbox">
-          <label>
-            <input id="use-passphrase-checkbox" type="checkbox">
-            <span for="use-passphrase-checkbox"
-                i18n-content="usePassphrase"></span>
-          </label>
-          <button id="set-passphrase" class="link-button"
-              i18n-content="setPassphrase">
-          </button>
-        </div>
-      </if>
     </section>
   </div>
   <div class="action-area">
@@ -94,11 +64,8 @@
     </if>
     <div id="spacer"></div>
     <div class="button-strip">
-      <button id="managed-user-settings-cancel" type="submit"
-          i18n-content="cancel">
-      </button>
-      <button id="managed-user-settings-confirm" type="submit"
-          i18n-content="ok">
+      <button id="managed-user-settings-done" type="submit"
+          i18n-content="done">
       </button>
     </div>
   </div>