DOMUI: A few fixes post-dialog refactoring.

* Add proper dialog classes for some CrOS overlays.
* Add proper dialog classes for a few overlays that were left behind last time.

BUG=70882
TEST=none

Review URL: http://codereview.chromium.org/6260019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72541 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 61 insertions, 53 deletions

diff --git a/chrome/browser/resources/options/alert_overlay.html b/chrome/browser/resources/options/alert_overlay.html
index 7512077..e1dbfc3 100644
--- a/chrome/browser/resources/options/alert_overlay.html
+++ b/chrome/browser/resources/options/alert_overlay.html
@@ -1,8 +1,12 @@
 <div class="page hidden" id="alertOverlay">
   <h1 id="alertOverlayTitle"></h1>
-  <div id="alertOverlayMessage"></div>
-  <div class="action-area button-strip">
-    <button type="reset" id="alertOverlayCancel"></button>
-    <button type="submit" id="alertOverlayOk"></button>
+  <div class="content-area">
+    <div id="alertOverlayMessage"></div>
+  </div>
+  <div class="action-area">
+    <div class="button-strip">
+      <button type="reset" id="alertOverlayCancel"></button>
+      <button type="submit" id="alertOverlayOk"></button>
+    </div>
   </div>
 </div>
diff --git a/chrome/browser/resources/options/browser_options_page.css b/chrome/browser/resources/options/browser_options_page.css
index 27e9b56..5992c6e 100644
--- a/chrome/browser/resources/options/browser_options_page.css
+++ b/chrome/browser/resources/options/browser_options_page.css
@@ -72,13 +72,11 @@
   font-family: inherit;
   white-space: pre-wrap;
   width: 500px;
-  padding: 0px 16px 0px 16px;
 }
 
 #instantConfirmLearnMore {
   position: absolute;
   bottom: 18px;
-  -webkit-margin-start: 16px;
 }
 
 #startupAddButton {
diff --git a/chrome/browser/resources/options/certificate_backup_overlay.html b/chrome/browser/resources/options/certificate_backup_overlay.html
index c5b5a18..280c27a 100644
--- a/chrome/browser/resources/options/certificate_backup_overlay.html
+++ b/chrome/browser/resources/options/certificate_backup_overlay.html
@@ -1,9 +1,6 @@
 <div class="page hidden" id="certificateBackupOverlay">
-  <p>
-    <span i18n-content="certificateExportPasswordDescription"></span>
-  </p>
-
-  <p>
+  <h1 i18n-content="certificateExportPasswordDescription"></h1>
+  <div class="content-area">
     <table>
       <tr>
         <label id="certificateBackupPasswordLabel">
@@ -26,17 +23,16 @@
         </label>
       </tr>
     </table>
-  </p>
-
-  <p>
-    <span i18n-content="certificateExportPasswordHelp"></span>
-  </p>
-
-  <div class="action-area button-strip">
-    <button type="reset" id="certificateBackupCancelButton"
-        i18n-content="cancel"></button>
-    <button type="submit" id="certificateBackupOkButton"
-        i18n-content="ok" disabled></button>
+    <p>
+      <span i18n-content="certificateExportPasswordHelp"></span>
+    </p>
+  </div>
+  <div class="action-area">
+    <div class="button-strip">
+      <button type="reset" id="certificateBackupCancelButton"
+          i18n-content="cancel"></button>
+      <button type="submit" id="certificateBackupOkButton" i18n-content="ok"
+          disabled></button>
+    </div>
   </div>
 </div>
-
diff --git a/chrome/browser/resources/options/certificate_import_error_overlay.html b/chrome/browser/resources/options/certificate_import_error_overlay.html
index b686920..d9b11c6 100644
--- a/chrome/browser/resources/options/certificate_import_error_overlay.html
+++ b/chrome/browser/resources/options/certificate_import_error_overlay.html
@@ -1,9 +1,13 @@
 <div class="page hidden" id="certificateImportErrorOverlay">
   <h1 id="certificateImportErrorOverlayTitle"></h1>
-  <div id="certificateImportErrorOverlayMessage"></div>
-  <ul id="certificateImportErrorOverlayCertErrors"></ul>
-  <div class="action-area button-strip">
-    <button type="submit" id="certificateImportErrorOverlayOk"
-        i18n-content="ok"></button>
+  <div class="content-area">
+    <div id="certificateImportErrorOverlayMessage"></div>
+    <ul id="certificateImportErrorOverlayCertErrors"></ul>
+  </div>
+  <div class="action-area">
+    <div class="button-strip">
+      <button type="submit" id="certificateImportErrorOverlayOk"
+          i18n-content="ok"></button>
+    </div>
   </div>
 </div>
diff --git a/chrome/browser/resources/options/certificate_restore_overlay.html b/chrome/browser/resources/options/certificate_restore_overlay.html
index b584982..ecbbe0c 100644
--- a/chrome/browser/resources/options/certificate_restore_overlay.html
+++ b/chrome/browser/resources/options/certificate_restore_overlay.html
@@ -1,19 +1,17 @@
 <div class="page hidden" id="certificateRestoreOverlay">
-  <p>
-    <span i18n-content="certificateRestorePasswordDescription"></span>
-  </p>
-
-  <p>
+  <h1 i18n-content="certificateRestorePasswordDescription"></h1>
+  <div class="content-area">
     <label id="certificateRestorePasswordLabel">
       <span i18n-content="certificatePasswordLabel"></span>
       <input type="password" id="certificateRestorePassword">
     </label>
-  </p>
-
-  <div class="action-area button-strip">
-    <button type="reset" id="certificateRestoreCancelButton"
-        i18n-content="cancel"></button>
-    <button type="submit" id="certificateRestoreOkButton"
-        i18n-content="ok"></button>
+  </div>
+  <div class="action-area">
+    <div class="button-strip">
+      <button type="reset" id="certificateRestoreCancelButton"
+          i18n-content="cancel"></button>
+      <button type="submit" id="certificateRestoreOkButton" i18n-content="ok">
+      </button>
+    </div>
   </div>
 </div>
diff --git a/chrome/browser/resources/options/chromeos_language_customize_modifier_keys_overlay.html b/chrome/browser/resources/options/chromeos_language_customize_modifier_keys_overlay.html
index abdf6e9..fbecd13 100644
--- a/chrome/browser/resources/options/chromeos_language_customize_modifier_keys_overlay.html
+++ b/chrome/browser/resources/options/chromeos_language_customize_modifier_keys_overlay.html
@@ -1,5 +1,5 @@
 <div class="page hidden" id="languageCustomizeModifierKeysOverlay">
-  <section>
+  <div class="content-area">
     <table class="option-control-table">
        <tr>
          <td class="option-name" i18n-content="xkbRemapSearchKeyToContent"></td>
@@ -30,8 +30,12 @@
          </td>
        </tr>
     </table>
-  </section>
-  <button id="languageCustomizeModifierKeysOverleyDismissButton"
-      i18n-content="close"
-      onclick="OptionsPage.clearOverlays();"></button>
+  </div>
+  <div class="action-area">
+    <div class="button-strip">
+      <button id="languageCustomizeModifierKeysOverleyDismissButton"
+          i18n-content="close"
+          onclick="OptionsPage.clearOverlays();"></button>
+    </div>
+  </div>
 </div>
diff --git a/chrome/browser/resources/options/instant_confirm_overlay.html b/chrome/browser/resources/options/instant_confirm_overlay.html
index fe0b8b1..e49d609 100644
--- a/chrome/browser/resources/options/instant_confirm_overlay.html
+++ b/chrome/browser/resources/options/instant_confirm_overlay.html
@@ -1,12 +1,16 @@
-<div class="page hidden" id="instantConfirmOverlay">
+<div id="instantConfirmOverlay" class="page hidden">
   <h1 i18n-content="instantConfirmTitle"></h1>
   <!-- The text has line breaks, so we must use a pre. -->
-  <pre id="instantConfirmText" i18n-content="instantConfirmMessage"></pre>
-  <a target="_blank" i18n-values="href:instantLearnMoreLink"
-     i18n-content="learnMore" id="instantConfirmLearnMore"></a>
-  <div class="action-area button-strip">
-    <button id="instantConfirmCancel" i18n-content="cancel"
-            class="cancel-button"></button>
-    <button id="instantConfirmOk" i18n-content="ok"></button>
+  <div class="content-area">
+    <pre id="instantConfirmText" i18n-content="instantConfirmMessage"></pre>
+    <a target="_blank" i18n-values="href:instantLearnMoreLink"
+       i18n-content="learnMore" id="instantConfirmLearnMore"></a>
+  </div>
+  <div class="action-area">
+    <div class="button-strip">
+      <button id="instantConfirmCancel" i18n-content="cancel"
+              class="cancel-button"></button>
+      <button id="instantConfirmOk" i18n-content="ok"></button>
+    </div>
   </div>
 </div>