Options: Style cleanup - id attribute first.

Also remove some unecessary blank lines.

BUG=none
TEST=none

R=csilv@chromium.org

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

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

32 files changed, 223 insertions, 239 deletions

diff --git a/chrome/browser/resources/options/about_page.html b/chrome/browser/resources/options/about_page.html
index 32d1faa..05baa8d 100644
--- a/chrome/browser/resources/options/about_page.html
+++ b/chrome/browser/resources/options/about_page.html
@@ -1,4 +1,4 @@
-<div class="page" id="aboutPage" hidden>
+<div id="aboutPage" class="page" hidden>
   <h1 i18n-content="product"></h1>
   <div id="aboutPageLessInfo">
     <section>
@@ -13,8 +13,8 @@
           <span i18n-content="browser_version"></span>
         </div>
         <div>
-          <button class="link-button" id="moreInfoButton"
-                  i18n-content="more_info"></button>
+          <button id="moreInfoButton" class="link-button"
+              i18n-content="more_info"></button>
         </div>
       </div>
     </section>
@@ -28,7 +28,7 @@
           <option value="beta-channel" i18n-content="beta"></option>
           <option value="dev-channel" i18n-content="dev"></option>
         </select>
-        <div hidden id="channelWarningBlock">
+        <div id="channelWarningBlock" hidden>
           <div id="channelWarning" i18n-content="channel_warning_header"></div>
           <div i18n-content="channel_warning_text"></div>
         </div>
@@ -101,7 +101,7 @@
       <div>
         <!-- TODO seanparent: fill in last checked. -->
         <!-- <span i18n-content="last_check"></span> -->
-        <button disabled id="checkNow" i18n-content="check_now"></button>
+        <button id="checkNow" i18n-content="check_now" disabled></button>
       </div>
     </div>
   </section>
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 662cc69..403a73e 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -46,17 +46,17 @@
         </label>
       </div>
 <if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')">
-      <div class="checkbox" id="metricsReportingSetting">
+      <div id="metricsReportingSetting" class="checkbox">
         <label>
           <input id="metricsReportingEnabled"
               pref="cros.metrics.reportingEnabled" type="checkbox">
-          <span i18n-content="enableLogging" id="metricsReportingEnabledText">
+          <span id="metricsReportingEnabledText" i18n-content="enableLogging">
           </span>
         </label>
       </div>
 </if>
 <if expr="pp_ifdef('_google_chrome') and not pp_ifdef('chromeos')">
-      <div class="checkbox" id="metricsReportingSetting">
+      <div id="metricsReportingSetting" class="checkbox">
         <label>
           <input id="metricsReportingEnabled" type="checkbox">
           <span i18n-content="enableLogging"></span>
diff --git a/chrome/browser/resources/options/alert_overlay.html b/chrome/browser/resources/options/alert_overlay.html
index aa189c0..3de00e7 100644
--- a/chrome/browser/resources/options/alert_overlay.html
+++ b/chrome/browser/resources/options/alert_overlay.html
@@ -1,12 +1,12 @@
-<div class="page" id="alertOverlay" hidden>
+<div id="alertOverlay" class="page" hidden>
   <h1 id="alertOverlayTitle"></h1>
   <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>
+      <button id="alertOverlayCancel" type="reset"></button>
+      <button id="alertOverlayOk" type="submit"></button>
     </div>
   </div>
 </div>
diff --git a/chrome/browser/resources/options/autofill_edit_address_overlay.html b/chrome/browser/resources/options/autofill_edit_address_overlay.html
index 0d8c3b7..e4ad619 100644
--- a/chrome/browser/resources/options/autofill_edit_address_overlay.html
+++ b/chrome/browser/resources/options/autofill_edit_address_overlay.html
@@ -1,4 +1,4 @@
-<div class="page" id="autofill-edit-address-overlay" hidden>
+<div id="autofill-edit-address-overlay" class="page" hidden>
   <h1 id="autofill-address-title"></h1>
   <div class="content-area">
     <div class="input">
@@ -11,19 +11,19 @@
     <div class="input">
       <label>
         <div><span i18n-content="companyNameLabel"></span></div>
-        <input type="text" class="autofill-form" id="company-name">
+        <input id="company-name" type="text" class="autofill-form">
       </label>
     </div>
     <div class="input">
       <label>
         <div><span i18n-content="addrLine1Label"></span></div>
-        <input type="text" class="autofill-form" id="addr-line-1">
+        <input id="addr-line-1" type="text" class="autofill-form">
       </label>
     </div>
     <div class="input">
       <label>
         <div><span i18n-content="addrLine2Label"></span></div>
-        <input type="text" class="autofill-form" id="addr-line-2">
+        <input id="addr-line-2" type="text" class="autofill-form">
       </label>
     </div>
     <div class="table">
@@ -42,19 +42,21 @@
       </div>
       <div class="row">
         <div class="input cell">
-          <input type="text" class="autofill-form" id="city">
+          <input id="city" type="text" class="autofill-form">
         </div>
         <div class="input cell">
-          <input type="text" class="autofill-form" id="state">
+          <input id="state" type="text" class="autofill-form">
         </div>
         <div class="input cell">
-          <input type="text" class="autofill-form" id="postal-code">
+          <input id="postal-code" type="text" class="autofill-form">
         </div>
       </div>
     </div>
     <div class="input">
       <label>
-        <div><span i18n-content="countryLabel"></span></div>
+        <div>
+          <span i18n-content="countryLabel"></span>
+        </div>
         <select id="country"></select>
       </label>
     </div>
@@ -99,9 +101,9 @@
     </div>
   </div>
   <div class="action-area button-strip">
-    <button type="reset" id="autofill-edit-address-cancel-button"
+    <button id="autofill-edit-address-cancel-button" type="reset"
         i18n-content="cancel"></button>
-    <button type="submit" id="autofill-edit-address-apply-button" disabled
-        i18n-content="ok"></button>
+    <button id="autofill-edit-address-apply-button" type="submit"
+        i18n-content="ok" disabled></button>
   </div>
 </div>
diff --git a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html
index e937c15..fa3825a 100644
--- a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html
+++ b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html
@@ -1,16 +1,16 @@
-<div class="page" id="autofill-edit-credit-card-overlay" hidden>
+<div id="autofill-edit-credit-card-overlay" class="page" hidden>
   <h1 id="autofill-credit-card-title"></h1>
   <div class="content-area">
     <div class="input">
       <label>
         <span i18n-content="nameOnCardLabel"></span><br>
-        <input type="text" id="name-on-card">
+        <input id="name-on-card" type="text">
       </label>
     </div>
     <div class="input">
       <label>
         <span i18n-content="creditCardNumberLabel"></span><br>
-        <input type="text" id="credit-card-number">
+        <input id="credit-card-number" type="text">
       </label>
     </div>
     <div class="input">
@@ -22,9 +22,9 @@
     </div>
   </div>
   <div class="action-area button-strip">
-    <button type="reset" id="autofill-edit-credit-card-cancel-button"
+    <button id="autofill-edit-credit-card-cancel-button" type="reset"
         i18n-content="cancel"></button>
-    <button type="submit" id="autofill-edit-credit-card-apply-button" disabled
-        i18n-content="ok"></button>
+    <button id="autofill-edit-credit-card-apply-button" type="submit"
+        i18n-content="ok" disabled></button>
   </div>
 </div>
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 66b1fee..4340615 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -19,7 +19,7 @@
       </div>
       <div class="radio">
         <label>
-          <input type="radio" name="startup" id="startupShowPagesButton"
+          <input id="startupShowPagesButton" type="radio" name="startup"
               pref="session.restore_on_startup" value="4"
               metric="Options_Startup_Custom">
           <span id="startupShowPagesLabel"
@@ -42,7 +42,7 @@
     <div>
       <div class="radio">
         <label>
-          <input type="radio" name="homepage" id="homepageUseNTPButton"
+          <input id="homepageUseNTPButton" type="radio" name="homepage"
               value="true" metric="Options_Homepage_IsNewTabPage">
           <span i18n-content="homepageUseNewTab"></span>
         </label>
@@ -50,7 +50,7 @@
       <div id="customHomePageGroup">
         <div class="radio">
           <label>
-            <input type="radio" name="homepage" id="homepageUseURLButton"
+            <input id="homepageUseURLButton" type="radio" name="homepage"
                 value="false" metric="Options_Homepage_IsNewTabPage">
             <span i18n-content="homepageUseURL"></span>
           </label>
@@ -89,10 +89,10 @@
           <button id="defaultSearchManageEnginesButton"
               i18n-content="defaultSearchManageEngines"></button>
         </div>
-        <div class="checkbox" id="instantOption">
+        <div id="instantOption" class="checkbox">
           <label>
             <!-- TODO(estade): metric? -->
-            <input type="checkbox" id="instantEnableCheckbox"
+            <input id="instantEnableCheckbox" type="checkbox"
                 pref="instant.enabled">
             <span i18n-content="instantName"></span>
           </label>
diff --git a/chrome/browser/resources/options/certificate_backup_overlay.html b/chrome/browser/resources/options/certificate_backup_overlay.html
index 95b5d85..b0bcea3 100644
--- a/chrome/browser/resources/options/certificate_backup_overlay.html
+++ b/chrome/browser/resources/options/certificate_backup_overlay.html
@@ -1,4 +1,4 @@
-<div class="page" id="certificateBackupOverlay" hidden>
+<div id="certificateBackupOverlay" class="page" hidden>
   <h1 i18n-content="certificateExportPasswordDescription"></h1>
   <div class="content-area">
     <table>
@@ -9,7 +9,7 @@
           </label>
         </td>
         <td>
-          <input type="password" id="certificateBackupPassword">
+          <input id="certificateBackupPassword" type="password">
         </td>
       </tr>
       <tr>
@@ -19,7 +19,7 @@
           </label>
         </td>
         <td>
-          <input type="password" id="certificateBackupPassword2">
+          <input id="certificateBackupPassword2" type="password">
         </td>
       </tr>
     </table>
@@ -29,9 +29,9 @@
   </div>
   <div class="action-area">
     <div class="button-strip">
-      <button type="reset" id="certificateBackupCancelButton"
+      <button id="certificateBackupCancelButton" type="reset"
           i18n-content="cancel"></button>
-      <button type="submit" id="certificateBackupOkButton" i18n-content="ok"
+      <button id="certificateBackupOkButton" type="submit" i18n-content="ok"
           disabled></button>
     </div>
   </div>
diff --git a/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html
index 179566b..b45bfc9 100644
--- a/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html
+++ b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html
@@ -1,4 +1,4 @@
-<div class="page" id="certificateEditCaTrustOverlay" hidden>
+<div id="certificateEditCaTrustOverlay" class="page" hidden>
   <div class="content-area">
     <p>
       <span id="certificateEditCaTrustDescription"></span>
@@ -7,26 +7,26 @@
       <span i18n-content="certificateEditTrustLabel"></span>
       <br>
       <label id="certificateCaTrustSSLLabel">
-        <input type="checkbox" id="certificateCaTrustSSLCheckbox">
+        <input id="certificateCaTrustSSLCheckbox" type="checkbox">
         <span i18n-content="certificateCaTrustSSLLabel"></span>
       </label>
       <br>
       <label id="certificateCaTrustEmailLabel">
-        <input type="checkbox" id="certificateCaTrustEmailCheckbox">
+        <input id="certificateCaTrustEmailCheckbox" type="checkbox">
         <span i18n-content="certificateCaTrustEmailLabel"></span>
       </label>
       <br>
       <label id="certificateCaTrustObjSignLabel">
-        <input type="checkbox" id="certificateCaTrustObjSignCheckbox">
+        <input id="certificateCaTrustObjSignCheckbox" type="checkbox">
         <span i18n-content="certificateCaTrustObjSignLabel"></span>
       </label>
     </p>
   </div>
   <div class="action-area">
     <div class="button-strip">
-      <button type="reset" id="certificateEditCaTrustCancelButton"
+      <button id="certificateEditCaTrustCancelButton" type="reset"
           i18n-content="cancel"></button>
-      <button type="submit" id="certificateEditCaTrustOkButton"
+      <button id="certificateEditCaTrustOkButton" type="submit"
           i18n-content="ok"></button>
     </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 1dfbf48..02a7e2d 100644
--- a/chrome/browser/resources/options/certificate_import_error_overlay.html
+++ b/chrome/browser/resources/options/certificate_import_error_overlay.html
@@ -1,4 +1,4 @@
-<div class="page" id="certificateImportErrorOverlay" hidden>
+<div id="certificateImportErrorOverlay" class="page" hidden>
   <h1 id="certificateImportErrorOverlayTitle"></h1>
   <div class="content-area">
     <div id="certificateImportErrorOverlayMessage"></div>
@@ -6,7 +6,7 @@
   </div>
   <div class="action-area">
     <div class="button-strip">
-      <button type="submit" id="certificateImportErrorOverlayOk"
+      <button id="certificateImportErrorOverlayOk" type="submit"
           i18n-content="ok"></button>
     </div>
   </div>
diff --git a/chrome/browser/resources/options/certificate_manager.html b/chrome/browser/resources/options/certificate_manager.html
index 279caf1..6497448 100644
--- a/chrome/browser/resources/options/certificate_manager.html
+++ b/chrome/browser/resources/options/certificate_manager.html
@@ -1,6 +1,5 @@
-<div class="page" id="certificateManagerPage" hidden>
+<div id="certificateManagerPage" class="page" hidden>
   <h1 i18n-content="certificateManagerPage"></h1>
-
   <!-- Navigation tabs -->
   <div class="subpages-nav-tabs">
     <span id="personal-certs-nav-tab" class="tab"
@@ -28,9 +27,7 @@
       <span class="active-tab-label" i18n-content="unknownCertsTabTitle"></span>
     </span>
   </div>
-
   <!-- TODO(mattm): get rid of use of tables? -->
-
   <!-- Tab contents -->
   <div id="personalCertsTab" class="subpages-tab-contents">
     <table class="certificate-tree-table">
@@ -61,7 +58,6 @@
       </td></tr>
     </table>
   </div>
-
   <div id="serverCertsTab" class="subpages-tab-contents">
     <table class="certificate-tree-table">
       <tr><td>
@@ -86,7 +82,6 @@
       </td></tr>
     </table>
   </div>
-
   <div id="caCertsTab" class="subpages-tab-contents">
     <table class="certificate-tree-table">
       <tr><td>
@@ -109,7 +104,6 @@
       </td></tr>
     </table>
   </div>
-
   <div id="otherCertsTab" class="subpages-tab-contents">
     <table class="certificate-tree-table">
       <tr><td>
@@ -128,5 +122,4 @@
       </td></tr>
     </table>
   </div>
-
 </div>
diff --git a/chrome/browser/resources/options/certificate_restore_overlay.html b/chrome/browser/resources/options/certificate_restore_overlay.html
index d8fd658..30b380d 100644
--- a/chrome/browser/resources/options/certificate_restore_overlay.html
+++ b/chrome/browser/resources/options/certificate_restore_overlay.html
@@ -1,16 +1,16 @@
-<div class="page" id="certificateRestoreOverlay" hidden>
+<div id="certificateRestoreOverlay" class="page" hidden>
   <h1 i18n-content="certificateRestorePasswordDescription"></h1>
   <div class="content-area">
     <label id="certificateRestorePasswordLabel">
       <span i18n-content="certificatePasswordLabel"></span>
-      <input type="password" id="certificateRestorePassword">
+      <input id="certificateRestorePassword" type="password">
     </label>
   </div>
   <div class="action-area">
     <div class="button-strip">
-      <button type="reset" id="certificateRestoreCancelButton"
+      <button id="certificateRestoreCancelButton" type="reset"
           i18n-content="cancel"></button>
-      <button type="submit" id="certificateRestoreOkButton" i18n-content="ok">
+      <button id="certificateRestoreOkButton" type="submit" i18n-content="ok">
       </button>
     </div>
   </div>
diff --git a/chrome/browser/resources/options/chromeos/accounts_options.html b/chrome/browser/resources/options/chromeos/accounts_options.html
index ad99aa4..d780754 100644
--- a/chrome/browser/resources/options/chromeos/accounts_options.html
+++ b/chrome/browser/resources/options/chromeos/accounts_options.html
@@ -1,4 +1,4 @@
-<div class="page" id="accountsPage" hidden>
+<div id="accountsPage" class="page" hidden>
   <h1 i18n-content="accountsPage"></h1>
   <section>
     <div class="option">
diff --git a/chrome/browser/resources/options/chromeos/change_picture_options.html b/chrome/browser/resources/options/chromeos/change_picture_options.html
index fb1be89..717c672 100644
--- a/chrome/browser/resources/options/chromeos/change_picture_options.html
+++ b/chrome/browser/resources/options/chromeos/change_picture_options.html
@@ -4,7 +4,7 @@
   <div id="images-list">
     <div id="take-photo-item" class="list-element">
       <img id="take-photo-button"
-           src="chrome://theme/IDR_BUTTON_USER_IMAGE_TAKE_PHOTO">
+          src="chrome://theme/IDR_BUTTON_USER_IMAGE_TAKE_PHOTO">
     </div>
     <div id="choose-file-item" class="list-element">
       <img id="choose-file-button"
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.html b/chrome/browser/resources/options/chromeos/internet_detail.html
index e4da34a..93b29ef 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.html
+++ b/chrome/browser/resources/options/chromeos/internet_detail.html
@@ -1,7 +1,7 @@
-<div class="page" id="detailsInternetPage" hidden>
+<div id="detailsInternetPage" class="page" hidden>
   <h1 id="inetTitle"></h1>
   <!-- Navigation tabs -->
-  <div class="subpages-nav-tabs" id="details-tab-strip">
+  <div id="details-tab-strip" class="subpages-nav-tabs">
     <span id="wifiNetworkNavTab" class="tab wifi-details"
         tab-contents="wifiNetworkTab">
       <span class="tab-label"
@@ -68,7 +68,7 @@
       class="subpages-tab-contents cellular-details cdma-only">
     <section>
       <div>
-        <table class="option-control-table" id="details-plan-table">
+        <table id="details-plan-table" class="option-control-table">
           <tr class="plan-loading-info">
             <td i18n-content="planLoading" class="option-value"></td>
           </tr>
diff --git a/chrome/browser/resources/options/chromeos/internet_options.html b/chrome/browser/resources/options/chromeos/internet_options.html
index 7654677..408965c 100644
--- a/chrome/browser/resources/options/chromeos/internet_options.html
+++ b/chrome/browser/resources/options/chromeos/internet_options.html
@@ -1,4 +1,4 @@
-<div class="page" id="internetPage" hidden>
+<div id="internetPage" class="page" hidden>
   <h1 i18n-content="internetPage"></h1>
   <div id="locked-network-banner">
     <span id="locked-network-icon"></span>
@@ -23,8 +23,7 @@
      </div>
      <div id="data-roaming" class="checkbox">
        <label>
-         <input id="enable-data-roaming"
-             pref="cros.signed.data_roaming_enabled"
+         <input id="enable-data-roaming" pref="cros.signed.data_roaming_enabled"
              metric="Options_Internet_DataRoaming" type="checkbox">
          <span i18n-content="enableDataRoaming"></span>
        </label>
@@ -33,14 +32,14 @@
   </section>
   <section id="wired-section">
     <h3 i18n-content="wired_title"></h3>
-    <div class="networks" id="wired-list"></div>
+    <div id="wired-list" class="networks"></div>
   </section>
   <section id="wireless-section">
     <h3 i18n-content="wireless_title"></h3>
-    <div class="networks" id="wireless-list"></div>
+    <div id="wireless-list" class="networks"></div>
   </section>
   <section id="remembered-section">
     <h3 i18n-content="remembered_title"></h3>
-    <div class="networks" id="remembered-list"></div>
+    <div id="remembered-list" class="networks"></div>
   </section>
 </div>
diff --git a/chrome/browser/resources/options/chromeos/language_chewing_options.html b/chrome/browser/resources/options/chromeos/language_chewing_options.html
index 6c951f5..995c8e0 100644
--- a/chrome/browser/resources/options/chromeos/language_chewing_options.html
+++ b/chrome/browser/resources/options/chromeos/language_chewing_options.html
@@ -1,4 +1,4 @@
-<div class="page" id="languageChewingPage" hidden>
+<div id="languageChewingPage" class="page" hidden>
   <h1 i18n-content="languageChewingPage"></h1>
   <section>
     <table class="option-control-table">
@@ -17,9 +17,8 @@
          <td class="option-name" colspan="2">
            <div class="checkbox">
              <label>
-               <input id="chewing-add-phrase-direction"
-                   pref="settings.language.chewing_add_phrase_direction"
-                   type="checkbox">
+               <input id="chewing-add-phrase-direction" type="checkbox"
+                   pref="settings.language.chewing_add_phrase_direction">
                <span i18n-content="Chewing_addPhraseDirection"></span>
              </label>
            </div>
@@ -30,9 +29,8 @@
          <td class="option-name" colspan="2">
            <div class="checkbox">
              <label>
-               <input id="chewing-easy-symbol-input"
-                   pref="settings.language.chewing_easy_symbol_input"
-                   type="checkbox">
+               <input id="chewing-easy-symbol-input" type="checkbox"
+                   pref="settings.language.chewing_easy_symbol_input">
                <span i18n-content="Chewing_easySymbolInput"></span>
              </label>
            </div>
@@ -43,9 +41,8 @@
          <td class="option-name" colspan="2">
            <div class="checkbox">
              <label>
-               <input id="chewing-esc-clean-all-buf"
-                   pref="settings.language.chewing_esc_clean_all_buf"
-                   type="checkbox">
+               <input id="chewing-esc-clean-all-buf" type="checkbox"
+                   pref="settings.language.chewing_esc_clean_all_buf">
                <span i18n-content="Chewing_escCleanAllBuf"></span>
              </label>
            </div>
@@ -55,9 +52,8 @@
          <td class="option-name" colspan="2">
            <div class="checkbox">
              <label>
-               <input id="chewing-force-lowercase-english"
-                   pref="settings.language.chewing_force_lowercase_english"
-                   type="checkbox">
+               <input id="chewing-force-lowercase-english" type="checkbox"
+                   pref="settings.language.chewing_force_lowercase_english">
                <span i18n-content="Chewing_forceLowercaseEnglish"></span>
              </label>
            </div>
@@ -68,9 +64,8 @@
          <td class="option-name" colspan="2">
            <div class="checkbox">
              <label>
-               <input id="chewing-plain-zhuyin"
-                   pref="settings.language.chewing_plain_zhuyin"
-                   type="checkbox">
+               <input id="chewing-plain-zhuyin" type="checkbox"
+                   pref="settings.language.chewing_plain_zhuyin">
               <span i18n-content="Chewing_plainZhuyin"></span>
              </label>
            </div>
@@ -81,9 +76,8 @@
          <td class="option-name" colspan="2">
            <div class="checkbox">
              <label>
-               <input id="chewing-phrase-choice-rearward"
-                   pref="settings.language.chewing_phrase_choice_rearward"
-                   type="checkbox">
+               <input id="chewing-phrase-choice-rearward" type="checkbox"
+                   pref="settings.language.chewing_phrase_choice_rearward">
                <span i18n-content="Chewing_phraseChoiceRearward"></span>
              </label>
            </div>
@@ -93,9 +87,8 @@
          <td class="option-name" colspan="2">
            <div class="checkbox">
              <label>
-               <input id="chewing-space-as-selection"
-                   pref="settings.language.chewing_space_as_selection"
-                   type="checkbox">
+               <input id="chewing-space-as-selection" type="checkbox"
+                   pref="settings.language.chewing_space_as_selection">
                <span i18n-content="Chewing_spaceAsSelection"></span>
              </label>
            </div>
@@ -104,47 +97,42 @@
        <tr>
          <td class="option-name" i18n-content="Chewing_maxChiSymbolLen"></td>
          <td class="option-value">
-           <input id="chewing-max-chi-symbol-len" class="control"
+           <input id="chewing-max-chi-symbol-len" class="control" type="range"
               pref="settings.language.chewing_max_chi_symbol_len"
               i18n-values="min:Chewing_maxChiSymbolLenMin;
-                           max:Chewing_maxChiSymbolLenMax"
-              type="range">
+                           max:Chewing_maxChiSymbolLenMax">
            <span id="chewing-max-chi-symbol-len-value"></span>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="Chewing_candPerPage"></td>
          <td class="option-value">
-           <select id="chewing-cand-per-page" class="control"
+           <select id="chewing-cand-per-page" class="control" dataType="number"
                 pref="settings.language.chewing_cand_per_page"
-                dataType="number"
                 i18n-options="Chewing_candPerPageValue"></select>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="Chewing_KBType"></td>
          <td class="option-value">
-           <select id="chewing-keyboard-type" class="control"
+           <select id="chewing-keyboard-type" class="control" dataType="string"
                 pref="settings.language.chewing_keyboard_type"
-                dataType="string"
                 i18n-options="Chewing_KBTypeValue"></select>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="Chewing_selKeys"></td>
          <td class="option-value">
-           <select id="chewing-sel-keys" class="control"
+           <select id="chewing-sel-keys" class="control" dataType="string"
                 pref="settings.language.chewing_sel_keys"
-                dataType="string"
                 i18n-options="Chewing_selKeysValue"></select>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="Chewing_hsuSelKeyType"></td>
          <td class="option-value">
-           <select id="chewing-sel-key-type" class="control"
+           <select id="chewing-sel-key-type" class="control" dataType="number"
                 pref="settings.language.chewing_hsu_sel_key_type"
-                dataType="number"
                 i18n-options="Chewing_hsuSelKeyTypeValue"></select>
          </td>
        </tr>
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 7e67017..af32e37 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,13 +1,12 @@
-<div class="page" id="languageCustomizeModifierKeysOverlay" hidden>
+<div id="languageCustomizeModifierKeysOverlay" class="page" hidden>
   <div class="content-area">
     <table class="option-control-table">
        <tr>
          <td class="option-name" i18n-content="xkbRemapSearchKeyToContent"></td>
          <td class="option-value">
            <select id="xkb-remap-search-key-to" class="control"
-                pref="settings.language.xkb_remap_search_key_to"
-                dataType="number"
-                i18n-options="xkbRemapSearchKeyToValue"></select>
+                dataType="number" i18n-options="xkbRemapSearchKeyToValue"
+                pref="settings.language.xkb_remap_search_key_to"></select>
          </td>
        </tr>
        <tr>
@@ -15,17 +14,15 @@
              i18n-content="xkbRemapControlKeyToContent"></td>
          <td class="option-value">
            <select id="xkb-remap-control-key-to" class="control"
-                pref="settings.language.xkb_remap_control_key_to"
-                dataType="number"
-                i18n-options="xkbRemapControlKeyToValue"></select>
+                dataType="number" i18n-options="xkbRemapControlKeyToValue"
+                pref="settings.language.xkb_remap_control_key_to"></select>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="xkbRemapAltKeyToContent"></td>
          <td class="option-value">
-           <select id="xkb-remap-alt-key-to" class="control"
+           <select id="xkb-remap-alt-key-to" class="control" dataType="number"
                 pref="settings.language.xkb_remap_alt_key_to"
-                dataType="number"
                 i18n-options="xkbRemapAltKeyToValue"></select>
          </td>
        </tr>
@@ -34,8 +31,7 @@
   <div class="action-area">
     <div class="button-strip">
       <button id="languageCustomizeModifierKeysOverleyDismissButton"
-          i18n-content="close"
-          onclick="OptionsPage.closeOverlay();"></button>
+          i18n-content="close" onclick="OptionsPage.closeOverlay();"></button>
     </div>
   </div>
 </div>
diff --git a/chrome/browser/resources/options/chromeos/language_hangul_options.html b/chrome/browser/resources/options/chromeos/language_hangul_options.html
index 6fed01a..74f66851 100644
--- a/chrome/browser/resources/options/chromeos/language_hangul_options.html
+++ b/chrome/browser/resources/options/chromeos/language_hangul_options.html
@@ -1,4 +1,4 @@
-<div class="page" id="languageHangulPage" hidden>
+<div id="languageHangulPage" class="page" hidden>
   <h1 i18n-content="languageHangulPage"></h1>
   <section>
     <div class="option">
@@ -6,9 +6,8 @@
        <tr>
          <td class="option-name" i18n-content="hangul_keyboard_layout"></td>
          <td class="option-value">
-           <select id="keyboard-layout-select" class="control"
+           <select id="keyboard-layout-select" class="control" dataType="string"
                 pref="settings.language.hangul_keyboard"
-                dataType="string"
                 i18n-options="HangulkeyboardLayoutList"></select>
          </td>
        </tr>
diff --git a/chrome/browser/resources/options/chromeos/language_mozc_options.html b/chrome/browser/resources/options/chromeos/language_mozc_options.html
index 21d40e6..a84ef0b 100644
--- a/chrome/browser/resources/options/chromeos/language_mozc_options.html
+++ b/chrome/browser/resources/options/chromeos/language_mozc_options.html
@@ -1,4 +1,4 @@
-<div class="page" id="languageMozcPage" hidden>
+<div id="languageMozcPage" class="page" hidden>
   <h1 i18n-content="languageMozcPage"></h1>
   <section>
     <table class="option-control-table">
@@ -54,9 +54,8 @@
         <td class="option-name" colspan="2">
           <div class="checkbox">
             <label>
-              <input  id="mozc-use-symbol-conversion"
-                  pref="settings.language.mozc_use_symbol_conversion"
-                  type="checkbox">
+              <input id="mozc-use-symbol-conversion" type="checkbox"
+                  pref="settings.language.mozc_use_symbol_conversion">
               <span i18n-content="mozc_use_symbol_conversion"></span>
             </label>
           </div>
@@ -66,9 +65,8 @@
         <td class="option-name" colspan="2">
           <div class="checkbox">
             <label>
-              <input id="mozc-use-number-conversion"
-                  pref="settings.language.mozc_use_number_conversion"
-                  type="checkbox">
+              <input id="mozc-use-number-conversion" type="checkbox"
+                  pref="settings.language.mozc_use_number_conversion">
               <span i18n-content="mozc_use_number_conversion"></span>
             </label>
           </div>
@@ -78,9 +76,8 @@
         <td class="option-name" colspan="2">
           <div class="checkbox">
             <label>
-              <input id="mozc-use-history-suggest"
-                  pref="settings.language.mozc_use_history_suggest"
-                  type="checkbox">
+              <input id="mozc-use-history-suggest" type="checkbox"
+                  pref="settings.language.mozc_use_history_suggest">
               <span i18n-content="mozc_use_history_suggest"></span>
             </label>
           </div>
@@ -90,9 +87,8 @@
         <td class="option-name" colspan="2">
           <div class="checkbox">
             <label>
-              <input id="mozc-use-dictionary-suggest"
-                  pref="settings.language.mozc_use_dictionary_suggest"
-                  type="checkbox">
+              <input id="mozc-use-dictionary-suggest" type="checkbox"
+                  pref="settings.language.mozc_use_dictionary_suggest">
               <span i18n-content="mozc_use_dictionary_suggest"></span>
             </label>
           </div>
@@ -101,18 +97,16 @@
       <tr>
         <td class="option-name" i18n-content="mozc_preedit_method"></td>
         <td class="option-value">
-          <select id="mozc-preedit-method" class="control"
+          <select id="mozc-preedit-method" class="control" dataType="string"
               pref="settings.language.mozc_preedit_method"
-              dataType="string"
               i18n-options="mozc_preedit_methodValue"></select>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="mozc_session_keymap"></td>
          <td class="option-value">
-           <select id="mozc-session-keymap" class="control"
+           <select id="mozc-session-keymap" class="control" dataType="string"
                pref="settings.language.mozc_session_keymap"
-               dataType="string"
                i18n-options="mozc_session_keymapValue"></select>
          </td>
        </tr>
@@ -121,16 +115,15 @@
          <td class="option-value">
            <select id="mozc-punctuation-method" class="control"
                pref="settings.language.mozc_punctuation_method"
-               dataType="string"
-               i18n-options="mozc_punctuation_methodValue"></select>
+               dataType="string" i18n-options="mozc_punctuation_methodValue">
+           </select>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="mozc_symbol_method"></td>
          <td class="option-value">
-           <select id="mozc-symbol-method" class="control"
+           <select id="mozc-symbol-method" class="control" dataType="string"
                pref="settings.language.mozc_symbol_method"
-               dataType="string"
                i18n-options="mozc_symbol_methodValue"></select>
          </td>
        </tr>
@@ -140,8 +133,8 @@
          <td class="option-value">
            <select id="mozc-space-character-form" class="control"
                pref="settings.language.mozc_space_character_form"
-               dataType="string"
-               i18n-options="mozc_space_character_formValue"></select>
+               dataType="string" i18n-options="mozc_space_character_formValue">
+           </select>
          </td>
        </tr>
        <tr>
@@ -160,8 +153,8 @@
          <td class="option-value">
            <select id="mozc-shift-key-mode-switch" class="control"
                pref="settings.language.mozc_shift_key_mode_switch"
-               dataType="string"
-               i18n-options="mozc_shift_key_mode_switchValue"></select>
+               dataType="string" i18n-options="mozc_shift_key_mode_switchValue">
+           </select>
          </td>
        </tr>
        <tr>
@@ -170,17 +163,16 @@
          <td class="option-value">
            <select id="mozc-numpad-character-form" class="control"
                pref="settings.language.mozc_numpad_character_form"
-               dataType="string"
-               i18n-options="mozc_numpad_character_formValue"></select>
+               dataType="string" i18n-options="mozc_numpad_character_formValue">
+           </select>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="mozc_suggestions_size">
          </td>
          <td class="option-value">
-           <select id="mozc-suggestions-size" class="control"
+           <select id="mozc-suggestions-size" class="control" dataType="number"
                pref="settings.language.mozc_suggestions_size"
-               dataType="number"
                i18n-options="mozc_suggestions_sizeValue"></select>
          </td>
        </tr>
diff --git a/chrome/browser/resources/options/chromeos/language_pinyin_options.html b/chrome/browser/resources/options/chromeos/language_pinyin_options.html
index 8b37da1..6866ce1 100644
--- a/chrome/browser/resources/options/chromeos/language_pinyin_options.html
+++ b/chrome/browser/resources/options/chromeos/language_pinyin_options.html
@@ -1,4 +1,4 @@
-<div class="page" id="languagePinyinPage" hidden>
+<div id="languagePinyinPage" class="page" hidden>
   <h1 i18n-content="languagePinyinPage"></h1>
   <section>
     <table class="option-control-table">
diff --git a/chrome/browser/resources/options/chromeos/proxy.html b/chrome/browser/resources/options/chromeos/proxy.html
index 63abe43..3f6233e 100644
--- a/chrome/browser/resources/options/chromeos/proxy.html
+++ b/chrome/browser/resources/options/chromeos/proxy.html
@@ -1,19 +1,19 @@
-<div class="page" id="proxyPage" hidden>
+<div id="proxyPage" class="page" hidden>
   <h1 i18n-content="proxyPage"></h1>
   <section>
     <h3 i18n-content="proxy_config_title"></h3>
     <div>
       <div class="radio">
         <label>
-          <input type="radio" id="directProxy" name="proxytype"
-              pref="cros.session.proxy.type" value="1">
+          <input id="directProxy" type="radio" name="proxytype" value="1"
+              pref="cros.session.proxy.type">
           <span i18n-content="proxyDirectInternetConnection"></span>
         </label>
       </div>
       <div class="radio">
         <label>
-          <input type="radio" id="manualProxy" name="proxytype"
-              pref="cros.session.proxy.type" value="2">
+          <input id="manualProxy" type="radio" name="proxytype" value="2"
+              pref="cros.session.proxy.type">
           <span i18n-content="proxyManual"></span>
         </label>
       </div>
@@ -26,60 +26,92 @@
       </div>
       <div id="singleProxy">
         <table>
-        <tr><td><span
-            i18n-content="httpProxy"></span>
-          <input id="proxyHostSingleName" type="text" size="30" pref="cros.session.proxy.singlehttp" disabled>
-          </td><td>
-          <span
-            i18n-content="proxyPort"></span>
-          <input id="proxyHostSinglePort" type="text" dataType="number" size="5" pref="cros.session.proxy.singlehttpport" disabled>
-          </td></tr>
+          <tr>
+            <td>
+              <span i18n-content="httpProxy"></span>
+              <input id="proxyHostSingleName" type="text" size="30"
+                  pref="cros.session.proxy.singlehttp" disabled>
+            </td>
+            <td>
+              <span i18n-content="proxyPort"></span>
+              <input id="proxyHostSinglePort" type="text" dataType="number" size="5"
+                  pref="cros.session.proxy.singlehttpport" disabled>
+            </td>
+          </tr>
         </table>
       </div>
       <div id="multiProxy">
         <table>
-        <tr>
-        <td><span
-            i18n-content="httpProxy"></span></td><td>
-          <input id="proxyHostName" type="text" size="30" pref="cros.session.proxy.httpurl" disabled>
-        </td><td>
-        <span
-          i18n-content="proxyPort"></span></td><td>
-        <input id="proxyHostPort" type="text" dataType="number" size="5" pref="cros.session.proxy.httpport" disabled>
-        </td></tr>
-        <tr>
-        <td><span
-          i18n-content="secureHttpProxy"></span></td><td>
-        <input id="secureProxyHostName" type="text" size="30" pref="cros.session.proxy.httpsurl" disabled>
-        </td><td>
-        <span
-          i18n-content="proxyPort"></span></td><td>
-        <input id="secureProxyPort" type="text" dataType="number" size="5" pref="cros.session.proxy.httpsport" disabled>
-        </td></tr>
-        <tr>
-        <td><span
-            i18n-content="ftpProxy"></span></td><td>
-          <input id="ftpProxy" type="text" size="30" pref="cros.session.proxy.ftpurl" disabled>
-          </td><td>
-          <span
-            i18n-content="proxyPort"></span></td><td>
-          <input id="ftpProxyPort" type="text" dataType="number" size="5" pref="cros.session.proxy.ftpport" disabled>
-        </td></tr>
-        <tr>
-        <td><span
-            i18n-content="socksHost"></span></td><td>
-          <input id="socksHost" type="text" size="30" pref="cros.session.proxy.socks" disabled>
-          </td><td>
-          <span
-            i18n-content="proxyPort"></span></td><td>
-          <input id="socksPort" type="text" dataType="number" size="5" pref="cros.session.proxy.socksport" disabled>
-        </td></tr>
+          <tr>
+            <td>
+              <span i18n-content="httpProxy"></span>
+            </td>
+            <td>
+              <input id="proxyHostName" type="text" size="30"
+                  pref="cros.session.proxy.httpurl" disabled>
+            </td>
+            <td>
+              <span i18n-content="proxyPort"></span>
+            </td>
+            <td>
+              <input id="proxyHostPort" type="text" dataType="number" size="5"
+                  pref="cros.session.proxy.httpport" disabled>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <span i18n-content="secureHttpProxy"></span>
+            </td>
+            <td>
+              <input id="secureProxyHostName" type="text" size="30"
+                  pref="cros.session.proxy.httpsurl" disabled>
+            </td>
+            <td>
+              <span i18n-content="proxyPort"></span>
+            </td>
+            <td>
+              <input id="secureProxyPort" type="text" dataType="number" size="5"
+                  pref="cros.session.proxy.httpsport" disabled>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <span i18n-content="ftpProxy"></span>
+            </td>
+            <td>
+              <input id="ftpProxy" type="text" size="30"
+                  pref="cros.session.proxy.ftpurl" disabled>
+            </td>
+            <td>
+              <span i18n-content="proxyPort"></span>
+              </td>
+            <td>
+              <input id="ftpProxyPort" type="text" dataType="number" size="5"
+                  pref="cros.session.proxy.ftpport" disabled>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <span i18n-content="socksHost"></span>
+            </td>
+            <td>
+              <input id="socksHost" type="text" size="30"
+                  pref="cros.session.proxy.socks" disabled>
+            </td>
+            <td>
+              <span i18n-content="proxyPort"></span>
+            </td>
+            <td>
+              <input id="socksPort" type="text" dataType="number" size="5"
+                  pref="cros.session.proxy.socksport" disabled>
+            </td>
+          </tr>
         </table>
       </div>
       <div class="radio">
         <label>
-          <input type="radio" id="autoProxy" name="proxytype"
-              pref="cros.session.proxy.type" value="3">
+          <input id="autoProxy" type="radio" name="proxytype" value="3"
+              pref="cros.session.proxy.type">
           <span i18n-content="proxyAutomatic"></span>
         <label>
       </div>
@@ -98,10 +130,8 @@
        <div i18n-content="proxyBypass"></div>
        <list id="ignoredHostList"></list>
        <input id="newHost" type="url" size="30">
-       <button id="addHost"
-               i18n-content="addHost"></button>
-       <button id="removeHost"
-               i18n-content="removeHost"></button>
+       <button id="addHost" i18n-content="addHost"></button>
+       <button id="removeHost" i18n-content="removeHost"></button>
     </div>
   </section>
 </div>
diff --git a/chrome/browser/resources/options/chromeos/system_options.html b/chrome/browser/resources/options/chromeos/system_options.html
index 650abe0..5d87dff 100644
--- a/chrome/browser/resources/options/chromeos/system_options.html
+++ b/chrome/browser/resources/options/chromeos/system_options.html
@@ -1,4 +1,4 @@
-<div class="page" id="systemPage" hidden>
+<div id="systemPage" class="page" hidden>
   <h1 i18n-content="systemPage"></h1>
   <section>
     <h3 i18n-content="datetime_title"></h3>
@@ -62,11 +62,13 @@
     <h3 i18n-content="language"></h3>
     <table class="option-control-table">
       <tr>
-        <td class="option-name"><button id="language-button"
-            i18n-content="language_customize"></button>
+        <td class="option-name">
+          <button id="language-button" i18n-content="language_customize">
+          </button>
         </td>
-         <td class="option-name"><button id="modifier-keys-button"
-             i18n-content="modifier_keys_customize"></button>
+         <td class="option-name">
+           <button id="modifier-keys-button"
+               i18n-content="modifier_keys_customize"></button>
          </td>
       </tr>
     </table>
diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html
index e8ec76d..0930ad9 100644
--- a/chrome/browser/resources/options/content_settings.html
+++ b/chrome/browser/resources/options/content_settings.html
@@ -1,4 +1,4 @@
-<div class="page" id="content-settings-page" hidden>
+<div id="content-settings-page" class="page" hidden>
   <h1 i18n-content="contentSettingsPage"></h1>
   <!-- Cookie filter tab contents -->
   <section>
@@ -22,7 +22,6 @@
           <span i18n-content="cookies_block"></span>
         </label>
       </div>
-
       <div class="checkbox">
         <label>
           <input id="block-third-party-cookies"
@@ -40,14 +39,12 @@
               class="clear-plugin-lso-data-disabled"></span>
         </label>
       </div>
-
       <button class="exceptions-list-button" contentType="cookies"
           i18n-content="manage_exceptions"></button>
       <button id="show-cookies-button"
           i18n-content="cookies_show_cookies"></button>
    </div>
   </section>
-
   <!-- Image filter -->
   <section>
     <h3 i18n-content="images_tab_label"></h3>
@@ -64,12 +61,10 @@
           <span i18n-content="images_block"></span>
         </label>
       </div>
-
       <button class="exceptions-list-button" contentType="images"
           i18n-content="manage_exceptions"></button>
     </div>
   </section>
-
   <!-- JavaScript filter -->
   <section>
     <h3 i18n-content="javascript_tab_label"></h3>
@@ -86,12 +81,10 @@
           <span i18n-content="javascript_block"></span>
         </label>
       </div>
-
       <button class="exceptions-list-button" contentType="javascript"
           i18n-content="manage_exceptions"></button>
     </div>
   </section>
-
   <!-- Plug-ins filter -->
   <section>
     <h3 i18n-content="plugins_tab_label"></h3>
@@ -102,7 +95,7 @@
           <span i18n-content="plugins_allow"></span>
         </label>
       </div>
-      <div class="radio" id="click_to_play">
+      <div id="click_to_play" class="radio">
         <label>
           <input type="radio" name="plugins" value="ask">
           <span i18n-content="plugins_ask"></span>
@@ -114,7 +107,6 @@
           <span i18n-content="plugins_block"></span>
         </label>
       </div>
-
       <button class="exceptions-list-button" contentType="plugins"
           i18n-content="manage_exceptions"></button>
       <a id="plugins-tab" href="about:plugins"
@@ -122,7 +114,6 @@
       </a>
     </div>
   </section>
-
   <!-- Pop-ups filter -->
   <section>
     <h3 i18n-content="popups_tab_label" class="content-settings-header"></h3>
@@ -139,12 +130,10 @@
           <span i18n-content="popups_block"></span>
         </label>
       </div>
-
       <button class="exceptions-list-button" contentType="popups"
           i18n-content="manage_exceptions"></button>
     </div>
   </section>
-
   <!-- Location filter -->
   <section>
     <h3 i18n-content="location_tab_label"></h3>
@@ -167,12 +156,10 @@
           <span i18n-content="location_block"></span>
         </label>
       </div>
-
       <button class="exceptions-list-button" contentType="location"
           i18n-content="manage_exceptions"></button>
     </div>
   </section>
-
   <!-- Notifications filter tab contents -->
   <section>
     <h3 i18n-content="notifications_tab_label"></h3>
@@ -195,7 +182,6 @@
           <span i18n-content="notifications_block"></span>
         </label>
       </div>
-
       <button class="exceptions-list-button" contentType="notifications"
           i18n-content="manage_exceptions"></button>
     </div>
diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.html b/chrome/browser/resources/options/content_settings_exceptions_area.html
index 180021e..043c4e9 100644
--- a/chrome/browser/resources/options/content_settings_exceptions_area.html
+++ b/chrome/browser/resources/options/content_settings_exceptions_area.html
@@ -1,4 +1,4 @@
-<div class="page" id="content-settings-exceptions-area" hidden>
+<div id="content-settings-exceptions-area" class="page" hidden>
   <h1></h1>
   <div id="exception-column-headers">
     <div id="exception-pattern-column" i18n-content="exceptionPatternHeader">
diff --git a/chrome/browser/resources/options/cookies_view.html b/chrome/browser/resources/options/cookies_view.html
index 7bd6fdc..1a58487 100644
--- a/chrome/browser/resources/options/cookies_view.html
+++ b/chrome/browser/resources/options/cookies_view.html
@@ -1,4 +1,4 @@
-<div class="page" id="cookiesViewPage" hidden>
+<div id="cookiesViewPage" class="page" hidden>
   <h1 i18n-content="cookiesViewPage"></h1>
   <div id="cookies-column-headers">
     <div id="cookies-site-column"><h3 i18n-content="cookie_domain"></h3></div>
diff --git a/chrome/browser/resources/options/instant_confirm_overlay.html b/chrome/browser/resources/options/instant_confirm_overlay.html
index 04da0d3..1e724ef 100644
--- a/chrome/browser/resources/options/instant_confirm_overlay.html
+++ b/chrome/browser/resources/options/instant_confirm_overlay.html
@@ -3,13 +3,13 @@
   <!-- The text has line breaks, so we must use a pre. -->
   <div class="content-area">
     <pre id="instantConfirmText" i18n-content="instantConfirmMessage"></pre>
-    <a target="_blank" i18n-values="href:instantLearnMoreLink"
-       i18n-content="learnMore" id="instantConfirmLearnMore"></a>
+    <a id="instantConfirmLearnMore" target="_blank" i18n-content="learnMore"
+        i18n-values="href:instantLearnMoreLink"></a>
   </div>
   <div class="action-area">
     <div class="button-strip">
       <button id="instantConfirmCancel" i18n-content="cancel"
-              class="cancel-button"></button>
+          class="cancel-button"></button>
       <button id="instantConfirmOk" i18n-content="ok"></button>
     </div>
   </div>
diff --git a/chrome/browser/resources/options/language_add_language_overlay.html b/chrome/browser/resources/options/language_add_language_overlay.html
index 7a266dc..6f7bee6 100644
--- a/chrome/browser/resources/options/language_add_language_overlay.html
+++ b/chrome/browser/resources/options/language_add_language_overlay.html
@@ -1,4 +1,4 @@
-<div class="page" id="add-language-overlay-page" hidden>
+<div id="add-language-overlay-page" class="page" hidden>
 <if expr="pp_ifdef('chromeos')">
   <ul id="add-language-overlay-language-list">
   </ul>
diff --git a/chrome/browser/resources/options/language_options.html b/chrome/browser/resources/options/language_options.html
index 6f55f32..386657a 100644
--- a/chrome/browser/resources/options/language_options.html
+++ b/chrome/browser/resources/options/language_options.html
@@ -1,4 +1,4 @@
-<div class="page" id="languagePage" hidden>
+<div id="languagePage" class="page" hidden>
   <h1 i18n-content="languagePage"></h1>
   <div id="notification">
     <span>&nbsp;</span>
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index b7c6812..a33e679 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -1,7 +1,5 @@
 <!DOCTYPE HTML>
-<html
-    i18n-values="dir:textdirection"
-    id="t">
+<html id="t" i18n-values="dir:textdirection">
 <head>
 <meta charset="utf-8">
 <!-- Set the title to that of the default page so that the title doesn't flash
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index aca7f90..344c7f8 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -50,7 +50,7 @@
           <button id="new-profile" i18n-content="createProfileButton"></button>
         </div>
       </div>
-      <a href="https://www.google.com/dashboard" id="privacy-dashboard-link"
+      <a id="privacy-dashboard-link" href="https://www.google.com/dashboard"
           i18n-content="privacyDashboardLink" target="_blank" hidden></a>
     </div>
   </section>
@@ -150,5 +150,4 @@
     </div>
   </section>
 </if>
-
 </div>
diff --git a/chrome/browser/resources/options/search_engine_manager.html b/chrome/browser/resources/options/search_engine_manager.html
index c000e3a..51a9e30 100644
--- a/chrome/browser/resources/options/search_engine_manager.html
+++ b/chrome/browser/resources/options/search_engine_manager.html
@@ -1,4 +1,4 @@
-<div class="page" id="searchEngineManagerPage" hidden>
+<div id="searchEngineManagerPage" class="page" hidden>
   <h1 i18n-content="searchEngineManagerPage"></h1>
   <h3 i18n-content="defaultSearchEngineListTitle"></h3>
   <list id="defaultSearchEngineList"
diff --git a/chrome/browser/resources/options/sync_setup_overlay.html b/chrome/browser/resources/options/sync_setup_overlay.html
index 5149872..33d25ec 100644
--- a/chrome/browser/resources/options/sync_setup_overlay.html
+++ b/chrome/browser/resources/options/sync_setup_overlay.html
@@ -341,10 +341,10 @@
                 <input id="confirm-passphrase" type="password"
                     i18n-values="placeholder:confirmLabel">
               </div>
-              <div class="error" style="display:none"
-                  id="empty-error" i18n-content="emptyErrorMessage"></div>
-              <div class="error" style="display:none"
-                  id="mismatch-error" i18n-content="mismatchErrorMessage"></div>
+              <div id="empty-error" class="error" style="display:none"
+                  i18n-content="emptyErrorMessage"></div>
+              <div id="mismatch-error" class="error" style="display:none"
+                  i18n-content="mismatchErrorMessage"></div>
             </div>
           </div>
         </div>