WebUI Prefs: Don't use display:block for labels

Separates our labels into a div and a label, so that labels are no longer display:block. Making labels display:block turns out to be undesirable because it makes the clickable area for the control the full width of the pane, rather than just the control and the label text.

BUG=69792
TEST=Click to the right of a checkbox or radio button's label; it should not active the control.

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

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

18 files changed, 654 insertions, 481 deletions

diff --git a/chrome/browser/resources/options/advanced_options.css b/chrome/browser/resources/options/advanced_options.css
index 8b92c75..eaffcd0 100644
--- a/chrome/browser/resources/options/advanced_options.css
+++ b/chrome/browser/resources/options/advanced_options.css
@@ -4,7 +4,7 @@
  * found in the LICENSE file.
  */
 
-#advancedPage > section > div:only-of-type > label.checkbox {
+#advancedPage > section > div:only-of-type > div.checkbox {
   margin: 10px 0;
 }
 
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index a8e8694..ef55854 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -17,39 +17,51 @@
         <a target="_blank" i18n-content="learnMore"
             i18n-values="href:privacyLearnMoreURL"></a>
       </div>
-      <label class="checkbox">
-        <input id="alternateErrorPagesEnabled" pref="alternate_error_pages.enabled"
-            metric="Options_LinkDoctorCheckbox" type="checkbox">
-        <span i18n-content="linkDoctorPref"></span>
-      </label>
-      <label class="checkbox">
-        <input id="searchSuggestEnabled" pref="search.suggest_enabled"
-            metric="Options_UseSuggestCheckbox" type="checkbox">
-        <span i18n-content="suggestPref"></span>
-      </label>
-      <label class="checkbox">
-        <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled"
-            metric="Options_DnsPrefetchCheckbox" type="checkbox">
-        <span i18n-content="networkDNSPrefetchEnabledDescription"></span>
-      </label>
-      <label class="checkbox">
-        <input id="safeBrowsingEnabled" pref="safebrowsing.enabled"
-            metric="Options_SafeBrowsingCheckbox" type="checkbox">
-        <span i18n-content="safeBrowsingEnableProtection"></span>
-      </label>
+      <div class="checkbox">
+        <label>
+          <input id="alternateErrorPagesEnabled" pref="alternate_error_pages.enabled"
+              metric="Options_LinkDoctorCheckbox" type="checkbox">
+          <span i18n-content="linkDoctorPref"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="searchSuggestEnabled" pref="search.suggest_enabled"
+              metric="Options_UseSuggestCheckbox" type="checkbox">
+          <span i18n-content="suggestPref"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled"
+              metric="Options_DnsPrefetchCheckbox" type="checkbox">
+          <span i18n-content="networkDNSPrefetchEnabledDescription"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="safeBrowsingEnabled" pref="safebrowsing.enabled"
+              metric="Options_SafeBrowsingCheckbox" type="checkbox">
+          <span i18n-content="safeBrowsingEnableProtection"></span>
+        </label>
+      </div>
 <if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')">
-      <label class="checkbox" id="metricsReportingSetting">
-        <input id="metricsReportingEnabled"
-            pref="cros.metrics.reportingEnabled" type="checkbox">
-        <span i18n-content="enableLogging" id="metricsReportingEnabledText">
-        </span>
-      </label>
+      <div class="checkbox" id="metricsReportingSetting">
+        <label>
+          <input id="metricsReportingEnabled"
+              pref="cros.metrics.reportingEnabled" type="checkbox">
+          <span i18n-content="enableLogging" id="metricsReportingEnabledText">
+          </span>
+        </label>
+      </div>
 </if>
 <if expr="pp_ifdef('_google_chrome') and not pp_ifdef('chromeos')">
-      <label class="checkbox" id="metricsReportingSetting">
-        <input id="metricsReportingEnabled" type="checkbox">
-        <span i18n-content="enableLogging"></span>
-      </label>
+      <div class="checkbox" id="metricsReportingSetting">
+        <label>
+          <input id="metricsReportingEnabled" type="checkbox">
+          <span i18n-content="enableLogging"></span>
+        </label>
+      </div>
 </if>
     </div>
   </section>
@@ -103,11 +115,13 @@
       </div>
 </if>
 <if expr="os == 'darwin'">
-      <label class="checkbox">
-        <input id="tabsToLinksPref" pref="webkit.webprefs.tabs_to_links"
-            metric="Options_TabsToLinks" type="checkbox">
-        <span i18n-content="tabsToLinksPref"></span>
-      </label>
+      <div class="checkbox">
+        <label>
+          <input id="tabsToLinksPref" pref="webkit.webprefs.tabs_to_links"
+              metric="Options_TabsToLinks" type="checkbox">
+          <span i18n-content="tabsToLinksPref"></span>
+        </label>
+      </div>
 </if>
     </div>
   </section>
@@ -123,8 +137,8 @@
   </section>
   <section>
     <h3 i18n-content="advancedSectionTitleTranslate"></h3>
-    <div>
-      <label class="checkbox">
+    <div class="checkbox">
+      <label>
         <input id="enableTranslate" pref="translate.enabled"
             metric="Options_Translate" type="checkbox">
         <span i18n-content="translateEnableTranslate"></span>
@@ -143,12 +157,14 @@
         <button id="downloadLocationChangeButton"
             i18n-content="downloadLocationChangeButton"></button>
       </div>
-      <label class="checkbox">
-        <input id="promptForDownload" metric="Options_AskForSaveLocation"
-            type="checkbox">
-        <span id="promptForDownloadLabel"
-            i18n-content="downloadLocationAskForSaveLocation"></span>
-      </label>
+      <div class="checkbox">
+        <label>
+          <input id="promptForDownload" metric="Options_AskForSaveLocation"
+              type="checkbox">
+          <span id="promptForDownloadLabel"
+              i18n-content="downloadLocationAskForSaveLocation"></span>
+        </label>
+      </div>
       <div id="auto-open-file-types-label"
           i18n-content="autoOpenFileTypesInfo"></div>
       <div class="section-group">
@@ -165,36 +181,48 @@
           i18n-content="certificatesManageButton"></button></div>
 <if expr="os == 'win32'">
       <!-- Configure these options for manual handling on windows -->
-      <label class="checkbox">
-        <input id="sslCheckRevocation" type="checkbox">
-        <span i18n-content="sslCheckRevocation"></span>
-      </label>
-      <label class="checkbox">
-        <input id="sslUseSSL3" type="checkbox">
-        <span i18n-content="sslUseSSL3"></span>
-      </label>
-      <label class="checkbox">
-        <input id="sslUseTLS1" type="checkbox">
-        <span i18n-content="sslUseTLS1"></span>
-      </label>
+      <div class="checkbox">
+        <label>
+          <input id="sslCheckRevocation" type="checkbox">
+          <span i18n-content="sslCheckRevocation"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="sslUseSSL3" type="checkbox">
+          <span i18n-content="sslUseSSL3"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="sslUseTLS1" type="checkbox">
+          <span i18n-content="sslUseTLS1"></span>
+        </label>
+      </div>
 </if>
 <if expr="os == 'linux2' or os.find('bsd') != -1">
       <!-- Configure these options for CrOS/Linux/BSD as preference keys -->
-      <label class="checkbox">
-        <input id="sslCheckRevocation" pref="ssl.rev_checking.enabled"
-            metric="Options_CheckCertRevocation" type="checkbox">
-        <span i18n-content="sslCheckRevocation"></span>
-      </label>
-      <label class="checkbox">
-        <input id="sslUseSSL3" pref="ssl.ssl3.enabled" metric="Options_SSL3"
-            type="checkbox">
-        <span i18n-content="sslUseSSL3"></span>
-      </label>
-      <label class="checkbox">
-        <input id="sslUseTLS1" pref="ssl.tls1.enabled" metric="Options_TLS1"
-            type="checkbox">
-        <span i18n-content="sslUseTLS1"></span>
-      </label>
+      <div class="checkbox">
+        <label>
+          <input id="sslCheckRevocation" pref="ssl.rev_checking.enabled"
+              metric="Options_CheckCertRevocation" type="checkbox">
+          <span i18n-content="sslCheckRevocation"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="sslUseSSL3" pref="ssl.ssl3.enabled" metric="Options_SSL3"
+              type="checkbox">
+          <span i18n-content="sslUseSSL3"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="sslUseTLS1" pref="ssl.tls1.enabled" metric="Options_TLS1"
+              type="checkbox">
+          <span i18n-content="sslUseTLS1"></span>
+        </label>
+      </div>
 </if>
     </div>
   </section>
diff --git a/chrome/browser/resources/options/autofill_options.html b/chrome/browser/resources/options/autofill_options.html
index 7c912c7..507c02e 100644
--- a/chrome/browser/resources/options/autofill_options.html
+++ b/chrome/browser/resources/options/autofill_options.html
@@ -1,10 +1,12 @@
 <div id="autofill-options" class="page hidden">
   <h1 i18n-content="autoFillOptionsPage"></h1>
 <if expr="os == 'darwin'">
-  <label class="checkbox">
-    <input pref="autofill.auxiliary_profiles_enabled" type="checkbox">
-    <span i18n-content="auxiliaryProfilesEnabled"></span>
-  </label>
+  <div class="checkbox">
+    <label>
+      <input pref="autofill.auxiliary_profiles_enabled" type="checkbox">
+      <span i18n-content="auxiliaryProfilesEnabled"></span>
+    </label>
+  </div>
 </if>
   <h3 i18n-content="autoFillAddresses"></h3>
   <div class="settings-list">
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 8c83ced..e79d702 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -3,19 +3,29 @@
   <section id="startupSection">
     <h3 i18n-content="startupGroupName"></h3>
     <div>
-      <label class="radio"><input type="radio" name="startup"
-          pref="session.restore_on_startup" value="0"
-          metric="Options_Startup_Homepage">
-          <span i18n-content="startupShowDefaultAndNewTab"></span></label>
-      <label class="radio"><input type="radio" name="startup"
-          pref="session.restore_on_startup" value="1"
-          metric="Options_Startup_LastSession">
-          <span i18n-content="startupShowLastSession"></span></label>
-      <label class="radio"><input type="radio" name="startup" id="startupShowPagesButton"
-          pref="session.restore_on_startup" value="4"
-          metric="Options_Startup_Custom">
+      <div class="radio">
+        <label>
+          <input type="radio" name="startup" pref="session.restore_on_startup"
+              value="0" metric="Options_Startup_Homepage">
+          <span i18n-content="startupShowDefaultAndNewTab"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="startup" pref="session.restore_on_startup"
+              value="1" metric="Options_Startup_LastSession">
+          <span i18n-content="startupShowLastSession"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="startup" id="startupShowPagesButton"
+              pref="session.restore_on_startup" value="4"
+              metric="Options_Startup_Custom">
           <span id="startupShowPagesLabel"
-              i18n-content="startupShowPages"></span></label>
+              i18n-content="startupShowPages"></span>
+        </label>
+      </div>
       <div class="suboption">
         <div id="startupPageManagement" class="settings-list">
           <list id="startupPagesList"></list>
@@ -32,17 +42,21 @@
   <section>
     <h3 i18n-content="homepageGroupName"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" name="homepage" id="homepageUseNTPButton"
-            value="true" metric="Options_Homepage_IsNewTabPage">
-        <span i18n-content="homepageUseNewTab"></span>
-      </label>
-      <div id="customHomePageGroup">
-        <label class="radio">
-          <input type="radio" name="homepage" id="homepageUseURLButton"
-              value="false" metric="Options_Homepage_IsNewTabPage">
-          <span i18n-content="homepageUseURL"></span>
+      <div class="radio">
+        <label>
+          <input type="radio" name="homepage" id="homepageUseNTPButton"
+              value="true" metric="Options_Homepage_IsNewTabPage">
+          <span i18n-content="homepageUseNewTab"></span>
         </label>
+      </div>
+      <div id="customHomePageGroup">
+        <div class="radio">
+          <label>
+            <input type="radio" name="homepage" id="homepageUseURLButton"
+                value="false" metric="Options_Homepage_IsNewTabPage">
+            <span i18n-content="homepageUseURL"></span>
+          </label>
+        </div>
         <div>
           <input id="homepageURL" class="favicon-cell" type="url">
         </div>
@@ -52,8 +66,8 @@
   <section>
     <h3 i18n-content="toolbarGroupName"></h3>
     <div>
-      <div class="option">
-        <label class="checkbox">
+      <div class="checkbox">
+        <label>
           <input id="toolbarShowHomeButton" pref="browser.show_home_button"
               metric="Options_Homepage_HomeButton" type="checkbox">
           <span i18n-content="toolbarShowHomeButton"></span>
@@ -69,16 +83,18 @@
           <button id="defaultSearchManageEnginesButton"
               i18n-content="defaultSearchManageEngines"></button>
         </div>
-        <label class="checkbox" id="instantOption">
-          <!-- TODO(estade): metric? -->
-          <input type="checkbox" id="instantEnableCheckbox"
-                 pref="instant.enabled">
-          <span i18n-content="instantName"></span>
-          <!-- This hidden checkbox allows us to get/set the state of the
-               confirm_dialog_shown pref -->
-          <input type="checkbox" class="hidden" id="instantDialogShown"
-                 pref="instant.confirm_dialog_shown">
-        </label>
+        <div class="checkbox" id="instantOption">
+          <label>
+            <!-- TODO(estade): metric? -->
+            <input type="checkbox" id="instantEnableCheckbox"
+                pref="instant.enabled">
+            <span i18n-content="instantName"></span>
+            <!-- This hidden checkbox allows us to get/set the state of the
+                 confirm_dialog_shown pref -->
+            <input type="checkbox" class="hidden" id="instantDialogShown"
+                pref="instant.confirm_dialog_shown">
+          </label>
+        </div>
         <div class="suboption informational-text">
           <span i18n-content="instantWarningText"></span>
           <a target="_blank" i18n-values="href:instantLearnMoreLink"
diff --git a/chrome/browser/resources/options/browser_options_page.css b/chrome/browser/resources/options/browser_options_page.css
index 67c0ec2..b59e462 100644
--- a/chrome/browser/resources/options/browser_options_page.css
+++ b/chrome/browser/resources/options/browser_options_page.css
@@ -21,7 +21,7 @@
   -webkit-box-orient: horizontal;
 }
 
-#customHomePageGroup > div {
+#customHomePageGroup > :last-child {
   -webkit-padding-start: 1ex;
   -webkit-box-flex: 1;
 }
diff --git a/chrome/browser/resources/options/chromeos_accounts_options.html b/chrome/browser/resources/options/chromeos_accounts_options.html
index 2f5af2a..0b5838a 100644
--- a/chrome/browser/resources/options/chromeos_accounts_options.html
+++ b/chrome/browser/resources/options/chromeos_accounts_options.html
@@ -9,29 +9,35 @@
       <table class="option-control-table">
       <tr>
         <td class="option-name">
-          <label class="checkbox">
-            <input id="allowBwsiCheck" pref="cros.accounts.allowBWSI"
-                type="checkbox">
-            <span i18n-content="allow_BWSI"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="allowBwsiCheck" pref="cros.accounts.allowBWSI"
+                  type="checkbox">
+              <span i18n-content="allow_BWSI"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name">
-          <label class="checkbox">
-            <input id="showUserNamesCheck"
-                pref="cros.accounts.showUserNamesOnSignIn" type="checkbox">
-            <span i18n-content="show_user_on_signin"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="showUserNamesCheck"
+                  pref="cros.accounts.showUserNamesOnSignIn" type="checkbox">
+              <span i18n-content="show_user_on_signin"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name">
-          <label class="checkbox">
-            <input id="useWhitelistCheck" pref="cros.accounts.allowGuest"
-                 type="checkbox" inverted_pref>
-            <span i18n-content="use_whitelist"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="useWhitelistCheck" pref="cros.accounts.allowGuest"
+                  type="checkbox" inverted_pref>
+              <span i18n-content="use_whitelist"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr><td>&nbsp;</td></tr>
diff --git a/chrome/browser/resources/options/chromeos_internet_detail.html b/chrome/browser/resources/options/chromeos_internet_detail.html
index 463a870..d31c806 100644
--- a/chrome/browser/resources/options/chromeos_internet_detail.html
+++ b/chrome/browser/resources/options/chromeos_internet_detail.html
@@ -41,10 +41,12 @@
         </tr>
         <tr>
           <td colspan="2">
-            <label class="checkbox">
-              <input id="autoConnectNetwork" type="checkbox">
-              <span i18n-content="inetAutoConnectNetwork"></span>
-            </label>
+            <div class="checkbox">
+              <label>
+                <input id="autoConnectNetwork" type="checkbox">
+                <span i18n-content="inetAutoConnectNetwork"></span>
+              </label>
+            </div>
           </td>
         </tr>
       </table>
@@ -100,8 +102,8 @@
       <div id="planList"></div>
     </section>
     <section class="plan-details-info">
-      <div>
-        <label class="checkbox">
+      <div class="checkbox">
+        <label>
           <input id="showPlanNotifications" type="checkbox"
                  pref="settings.internet.mobile.show_plan_notifications">
           <span i18n-content="showPlanNotifications"></span>
diff --git a/chrome/browser/resources/options/chromeos_language_chewing_options.html b/chrome/browser/resources/options/chromeos_language_chewing_options.html
index 810ecc8..b0d991a 100644
--- a/chrome/browser/resources/options/chromeos_language_chewing_options.html
+++ b/chrome/browser/resources/options/chromeos_language_chewing_options.html
@@ -4,81 +4,97 @@
     <table class="option-control-table">
        <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="chewing-auto-shift-cur"
-                pref="settings.language.chewing_auto_shift_cur" type="checkbox">
-            <span i18n-content="Chewing_autoShiftCur"></span>
-          </label>
+           <div class="checkbox">
+             <label>
+               <input id="chewing-auto-shift-cur"
+                   pref="settings.language.chewing_auto_shift_cur" type="checkbox">
+               <span i18n-content="Chewing_autoShiftCur"></span>
+             </label>
+           </div>
          </td>
        </tr>
        <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="chewing-add-phrase-direction"
-                pref="settings.language.chewing_add_phrase_direction"
-                type="checkbox">
-            <span i18n-content="Chewing_addPhraseDirection"></span>
-          </label>
+           <div class="checkbox">
+             <label>
+               <input id="chewing-add-phrase-direction"
+                   pref="settings.language.chewing_add_phrase_direction"
+                   type="checkbox">
+               <span i18n-content="Chewing_addPhraseDirection"></span>
+             </label>
+           </div>
          </td>
        </tr>
        <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="chewing-easy-symbol-input"
-                pref="settings.language.chewing_easy_symbol_input"
-                type="checkbox">
-            <span i18n-content="Chewing_easySymbolInput"></span>
-          </label>
+           <div class="checkbox">
+             <label>
+               <input id="chewing-easy-symbol-input"
+                   pref="settings.language.chewing_easy_symbol_input"
+                   type="checkbox">
+               <span i18n-content="Chewing_easySymbolInput"></span>
+             </label>
+           </div>
          </td>
        </tr>
        <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="chewing-esc-clean-all-buf"
-                pref="settings.language.chewing_esc_clean_all_buf"
-                type="checkbox">
-           <span i18n-content="Chewing_escCleanAllBuf"></span>
-          </label>
+           <div class="checkbox">
+             <label>
+               <input id="chewing-esc-clean-all-buf"
+                   pref="settings.language.chewing_esc_clean_all_buf"
+                   type="checkbox">
+               <span i18n-content="Chewing_escCleanAllBuf"></span>
+             </label>
+           </div>
          </td>
        </tr>
        <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="chewing-force-lowercase-english"
-                pref="settings.language.chewing_force_lowercase_english"
-                type="checkbox">
-           <span i18n-content="Chewing_forceLowercaseEnglish"></span>
-          </label>
+           <div class="checkbox">
+             <label>
+               <input id="chewing-force-lowercase-english"
+                   pref="settings.language.chewing_force_lowercase_english"
+                   type="checkbox">
+               <span i18n-content="Chewing_forceLowercaseEnglish"></span>
+             </label>
+           </div>
          </td>
        </tr>
        <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="chewing-plain-zhuyin"
-                pref="settings.language.chewing_plain_zhuyin"
-                type="checkbox">
-           <span i18n-content="Chewing_plainZhuyin"></span>
-          </label>
+           <div class="checkbox">
+             <label>
+               <input id="chewing-plain-zhuyin"
+                   pref="settings.language.chewing_plain_zhuyin"
+                   type="checkbox">
+              <span i18n-content="Chewing_plainZhuyin"></span>
+             </label>
+           </div>
          </td>
        </tr>
        <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="chewing-phrase-choice-rearward"
-                pref="settings.language.chewing_phrase_choice_rearward"
-                type="checkbox">
-           <span i18n-content="Chewing_phraseChoiceRearward"></span>
-          </label>
+           <div class="checkbox">
+             <label>
+               <input id="chewing-phrase-choice-rearward"
+                   pref="settings.language.chewing_phrase_choice_rearward"
+                   type="checkbox">
+               <span i18n-content="Chewing_phraseChoiceRearward"></span>
+             </label>
+           </div>
          </td>
        </tr>
        <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="chewing-space-as-selection"
-                pref="settings.language.chewing_space_as_selection"
-                type="checkbox">
-           <span i18n-content="Chewing_spaceAsSelection"></span>
-          </label>
+           <div class="checkbox">
+             <label>
+               <input id="chewing-space-as-selection"
+                   pref="settings.language.chewing_space_as_selection"
+                   type="checkbox">
+               <span i18n-content="Chewing_spaceAsSelection"></span>
+             </label>
+           </div>
          </td>
        </tr>
        <tr>
diff --git a/chrome/browser/resources/options/chromeos_language_mozc_options.html b/chrome/browser/resources/options/chromeos_language_mozc_options.html
index 2d3c6c5..e98f2e6 100644
--- a/chrome/browser/resources/options/chromeos_language_mozc_options.html
+++ b/chrome/browser/resources/options/chromeos_language_mozc_options.html
@@ -4,82 +4,98 @@
     <table class="option-control-table">
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="mozc-incognito-mode"
-                pref="settings.language.mozc_incognito_mode"
-                type="checkbox">
-            <span i18n-content="mozc_incognito_mode"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="mozc-incognito-mode"
+                  pref="settings.language.mozc_incognito_mode"
+                  type="checkbox">
+              <span i18n-content="mozc_incognito_mode"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-         <label class="checkbox">
-           <input id="mozc-use-auto-ime-turn-off"
-                pref="settings.language.mozc_use_auto_ime_turn_off"
-                type="checkbox">
-            <span i18n-content="mozc_use_auto_ime_turn_off"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="mozc-use-auto-ime-turn-off"
+                  pref="settings.language.mozc_use_auto_ime_turn_off"
+                  type="checkbox">
+              <span i18n-content="mozc_use_auto_ime_turn_off"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="mozc-use-date-conversion"
-                pref="settings.language.mozc_use_date_conversion"
-                type="checkbox">
-            <span i18n-content="mozc_use_date_conversion"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="mozc-use-date-conversion"
+                  pref="settings.language.mozc_use_date_conversion"
+                  type="checkbox">
+              <span i18n-content="mozc_use_date_conversion"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="mozc-use-single-kanji-conversion"
-                pref="settings.language.mozc_use_single_kanji_conversion"
-                type="checkbox">
-            <span i18n-content="mozc_use_single_kanji_conversion"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="mozc-use-single-kanji-conversion"
+                  pref="settings.language.mozc_use_single_kanji_conversion"
+                  type="checkbox">
+              <span i18n-content="mozc_use_single_kanji_conversion"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input  id="mozc-use-symbol-conversion"
-                pref="settings.language.mozc_use_symbol_conversion"
-                type="checkbox">
-            <span i18n-content="mozc_use_symbol_conversion"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input  id="mozc-use-symbol-conversion"
+                  pref="settings.language.mozc_use_symbol_conversion"
+                  type="checkbox">
+              <span i18n-content="mozc_use_symbol_conversion"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="mozc-use-number-conversion"
-                pref="settings.language.mozc_use_number_conversion"
-                type="checkbox">
-            <span i18n-content="mozc_use_number_conversion"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="mozc-use-number-conversion"
+                  pref="settings.language.mozc_use_number_conversion"
+                  type="checkbox">
+              <span i18n-content="mozc_use_number_conversion"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="mozc-use-history-suggest"
-                pref="settings.language.mozc_use_history_suggest"
-                type="checkbox">
-            <span i18n-content="mozc_use_history_suggest"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="mozc-use-history-suggest"
+                  pref="settings.language.mozc_use_history_suggest"
+                  type="checkbox">
+              <span i18n-content="mozc_use_history_suggest"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="mozc-use-dictionary-suggest"
-                pref="settings.language.mozc_use_dictionary_suggest"
-                type="checkbox">
-            <span i18n-content="mozc_use_dictionary_suggest"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="mozc-use-dictionary-suggest"
+                  pref="settings.language.mozc_use_dictionary_suggest"
+                  type="checkbox">
+              <span i18n-content="mozc_use_dictionary_suggest"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
diff --git a/chrome/browser/resources/options/chromeos_language_pinyin_options.html b/chrome/browser/resources/options/chromeos_language_pinyin_options.html
index d99f82b..15d9473 100644
--- a/chrome/browser/resources/options/chromeos_language_pinyin_options.html
+++ b/chrome/browser/resources/options/chromeos_language_pinyin_options.html
@@ -4,113 +4,134 @@
     <table class="option-control-table">
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-correct-pinyin"
-                pref="settings.language.pinyin_correct_pinyin"
-                type="checkbox">
-            <span i18n-content="PinyinCorrectPinyin"></span>
-          </label>
+          <div class="checkbox">
+            <labl>
+              <input id="pinyin-correct-pinyin"
+                  pref="settings.language.pinyin_correct_pinyin"
+                  type="checkbox">
+              <span i18n-content="PinyinCorrectPinyin"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-fuzzy-pinyin"
-                pref="settings.language.pinyin_fuzzy_pinyin"
-                type="checkbox">
-            <span i18n-content="PinyinFuzzyPinyin"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-fuzzy-pinyin"
+                  pref="settings.language.pinyin_fuzzy_pinyin"
+                  type="checkbox">
+              <span i18n-content="PinyinFuzzyPinyin"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input
-              id="pinyin-shift-select-candidate"
-              pref="settings.language.pinyin_shift_select_candidate"
-              type="checkbox">
-            <span i18n-content="PinyinShiftSelectCandidate"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-shift-select-candidate"
+                  pref="settings.language.pinyin_shift_select_candidate"
+                  type="checkbox">
+              <span i18n-content="PinyinShiftSelectCandidate"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-minus-equal-page"
-                pref="settings.language.pinyin_minus_equal_page"
-                type="checkbox">
-            <span i18n-content="PinyinMinusEqualPage"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-minus-equal-page"
+                  pref="settings.language.pinyin_minus_equal_page"
+                  type="checkbox">
+              <span i18n-content="PinyinMinusEqualPage"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-comma-period-page"
-                pref="settings.language.pinyin_comma_period_page"
-                type="checkbox">
-            <span i18n-content="PinyinCommaPeriodPage"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-comma-period-page"
+                  pref="settings.language.pinyin_comma_period_page"
+                  type="checkbox">
+              <span i18n-content="PinyinCommaPeriodPage"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-auto-commit"
-                pref="settings.language.pinyin_auto_commit"
-                type="checkbox">
-            <span i18n-content="PinyinAutoCommit"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-auto-commit"
+                  pref="settings.language.pinyin_auto_commit"
+                  type="checkbox">
+              <span i18n-content="PinyinAutoCommit"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-double-pinyin"
-                pref="settings.language.pinyin_double_pinyin"
-                type="checkbox">
-            <span i18n-content="PinyinDoublePinyin"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-double-pinyin"
+                  pref="settings.language.pinyin_double_pinyin"
+                  type="checkbox">
+              <span i18n-content="PinyinDoublePinyin"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
          <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-init-chinese"
-                pref="settings.language.pinyin_init_chinese"
-                type="checkbox">
-            <span i18n-content="PinyinInitChinese"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-init-chinese"
+                  pref="settings.language.pinyin_init_chinese"
+                  type="checkbox">
+              <span i18n-content="PinyinInitChinese"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-init-full"
-                pref="settings.language.pinyin_init_full"
-                type="checkbox">
-            <span i18n-content="PinyinInitFull"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-init-full"
+                  pref="settings.language.pinyin_init_full"
+                  type="checkbox">
+              <span i18n-content="PinyinInitFull"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-init-full-punct"
-                pref="settings.language.pinyin_init_full_punct"
-                type="checkbox">
-            <span i18n-content="PinyinInitFullPunct"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-init-full-punct"
+                  pref="settings.language.pinyin_init_full_punct"
+                  type="checkbox">
+              <span i18n-content="PinyinInitFullPunct"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="pinyin-init-simplified-chinese"
-                pref="settings.language.pinyin_init_simplified_chinese"
-                type="checkbox">
-            <span i18n-content="PinyinInitSimplifiedChinese"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="pinyin-init-simplified-chinese"
+                  pref="settings.language.pinyin_init_simplified_chinese"
+                  type="checkbox">
+              <span i18n-content="PinyinInitSimplifiedChinese"></span>
+            </label>
+          </div>
         </td>
       </tr>
       <tr>
diff --git a/chrome/browser/resources/options/chromeos_proxy.html b/chrome/browser/resources/options/chromeos_proxy.html
index 9c03980..ae9efe5 100644
--- a/chrome/browser/resources/options/chromeos_proxy.html
+++ b/chrome/browser/resources/options/chromeos_proxy.html
@@ -3,20 +3,27 @@
   <section>
     <h3 i18n-content="proxy_config_title"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" id="directProxy" name="proxytype"
-          pref="cros.session.proxy.type" value="1">
-        <span i18n-content="proxyDirectInternetConnection"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" id="manualProxy" name="proxytype"
-            pref="cros.session.proxy.type" value="2">
-        <span i18n-content="proxyManual"></span>
-      </label>
-      <label class="checkbox">
-        <input id="proxyAllProtocols" type="checkbox" pref="cros.session.proxy.single">
-        <span i18n-content="sameProxyProtocols"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" id="directProxy" name="proxytype"
+              pref="cros.session.proxy.type" value="1">
+          <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">
+          <span i18n-content="proxyManual"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="proxyAllProtocols" type="checkbox"
+              pref="cros.session.proxy.single">
+          <span i18n-content="sameProxyProtocols"></span>
+        </label>
+      </div>
       <div id="singleProxy">
         <table>
         <tr><td><span
@@ -69,20 +76,26 @@
         </td></tr>
         </table>
       </div>
-      <label class="radio">
-        <input type="radio" id="autoProxy" name="proxytype"
-            pref="cros.session.proxy.type" value="3">
-        <span i18n-content="proxyAutomatic"></span></label>
-      <label><span
-          i18n-content="proxyConfigUrl"></span>
-        <input id="proxyConfig" type="url" size="60" pref="cros.session.proxy.pacurl">
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" id="autoProxy" name="proxytype"
+              pref="cros.session.proxy.type" value="3">
+          <span i18n-content="proxyAutomatic"></span>
+        <label>
+      </div>
+      <div>
+        <label>
+          <span i18n-content="proxyConfigUrl"></span>
+          <input id="proxyConfig" type="url" size="60"
+              pref="cros.session.proxy.pacurl">
+        </label>
+      </div>
     </div>
   </section>
   <section id="advancedConfig">
     <h3 i18n-content="advanced_proxy_config"></h3>
     <div class="option">
-       <label><span i18n-content="proxyBypass"></span></label>
+       <div i18n-content="proxyBypass"></div>
        <list id="ignoredHostList"></list>
        <input id="newHost" type="url" size="30">
        <button id="addHost"
diff --git a/chrome/browser/resources/options/chromeos_system_options.html b/chrome/browser/resources/options/chromeos_system_options.html
index 93cf00b..a775a2e 100644
--- a/chrome/browser/resources/options/chromeos_system_options.html
+++ b/chrome/browser/resources/options/chromeos_system_options.html
@@ -34,12 +34,14 @@
       </tr>
       <tr>
         <td class="option-name" colspan="2">
-          <label class="checkbox">
-            <input id="tap-to-click-check"
-                pref="settings.touchpad.enable_tap_to_click"
-                type="checkbox">
-            <span i18n-content="enable_tap_to_click"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="tap-to-click-check"
+                  pref="settings.touchpad.enable_tap_to_click"
+                  type="checkbox">
+              <span i18n-content="enable_tap_to_click"></span>
+            </label>
+          </div>
         </td>
       </tr>
     </table>
@@ -62,10 +64,12 @@
     <table class="option-control-table">
       <tr>
         <td class="option-name">
-          <label class="checkbox">
-            <input id="accesibility-check" type="checkbox">
-            <span i18n-content="accessibility"></span>
-          </label>
+          <div class="checkbox">
+            <label>
+              <input id="accesibility-check" type="checkbox">
+              <span i18n-content="accessibility"></span>
+            </label>
+          </div>
         </td>
       </tr>
     </table>
diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html
index e82a2e8..722ac96 100644
--- a/chrome/browser/resources/options/clear_browser_data_overlay.html
+++ b/chrome/browser/resources/options/clear_browser_data_overlay.html
@@ -8,36 +8,48 @@
         dataType="number">
     </select>
     <div id="clear-data-checkboxes">
-      <label class="checkbox">
-        <input id="deleteBrowsingHistoryCheckbox"
-            pref="browser.clear_data.browsing_history" type="checkbox">
-        <span i18n-content="deleteBrowsingHistoryCheckbox"></span>
-      </label>
-      <label class="checkbox">
-        <input id="deleteDownloadHistoryCheckbox"
-            pref="browser.clear_data.download_history" type="checkbox">
-        <span i18n-content="deleteDownloadHistoryCheckbox"></span>
-      </label>
-      <label class="checkbox">
-        <input id="deleteCacheCheckbox"
-            pref="browser.clear_data.cache" type="checkbox">
-        <span i18n-content="deleteCacheCheckbox"></span>
-      </label>
-      <label class="checkbox">
-        <input id="deleteCookiesCheckbox"
-            pref="browser.clear_data.cookies" type="checkbox">
-        <span id="deleteCookiesLabel"></span>
-      </label>
-      <label class="checkbox">
-        <input id="deletePasswordsCheckbox"
-            pref="browser.clear_data.passwords" type="checkbox">
-        <span i18n-content="deletePasswordsCheckbox"></span>
-      </label>
-      <label class="checkbox">
-        <input id="deleteFormDataCheckbox"
-            pref="browser.clear_data.form_data" type="checkbox">
-        <span i18n-content="deleteFormDataCheckbox"></span>
-      </label>
+      <div class="checkbox">
+        <label>
+          <input id="deleteBrowsingHistoryCheckbox"
+              pref="browser.clear_data.browsing_history" type="checkbox">
+          <span i18n-content="deleteBrowsingHistoryCheckbox"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="deleteDownloadHistoryCheckbox"
+              pref="browser.clear_data.download_history" type="checkbox">
+          <span i18n-content="deleteDownloadHistoryCheckbox"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="deleteCacheCheckbox"
+              pref="browser.clear_data.cache" type="checkbox">
+          <span i18n-content="deleteCacheCheckbox"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="deleteCookiesCheckbox"
+              pref="browser.clear_data.cookies" type="checkbox">
+          <span id="deleteCookiesLabel"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="deletePasswordsCheckbox"
+              pref="browser.clear_data.passwords" type="checkbox">
+          <span i18n-content="deletePasswordsCheckbox"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="deleteFormDataCheckbox"
+              pref="browser.clear_data.form_data" type="checkbox">
+          <span i18n-content="deleteFormDataCheckbox"></span>
+        </label>
+      </div>
     </div>
   </div>
   <div class="action-area">
diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html
index dea3b86..c9805c7 100644
--- a/chrome/browser/resources/options/content_settings.html
+++ b/chrome/browser/resources/options/content_settings.html
@@ -4,25 +4,33 @@
   <section>
     <h3 i18n-content="cookies_tab_label"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" name="cookies" value="allow">
-        <span i18n-content="cookies_allow"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="cookies" value="block">
-         <span i18n-content="cookies_block"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" name="cookies" value="allow">
+          <span i18n-content="cookies_allow"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="cookies" value="block">
+          <span i18n-content="cookies_block"></span>
+        </label>
+      </div>
 
-      <label class="checkbox">
-        <input id="block-third-party-cookies"
-            pref="profile.block_third_party_cookies" type="checkbox">
-        <span i18n-content="cookies_block_3rd_party"></span>
-      </label>
-      <label class="checkbox">
-        <input id="clear-cookies-on-exit"
-            pref="profile.clear_site_data_on_exit" type="checkbox">
-        <span id="clear-cookies-on-exit-label"></span>
-      </label>
+      <div class="checkbox">
+        <label>
+          <input id="block-third-party-cookies"
+              pref="profile.block_third_party_cookies" type="checkbox">
+          <span i18n-content="cookies_block_3rd_party"></span>
+        </label>
+      </div>
+      <div class="checkbox">
+        <label>
+          <input id="clear-cookies-on-exit"
+              pref="profile.clear_site_data_on_exit" type="checkbox">
+          <span id="clear-cookies-on-exit-label"></span>
+        </label>
+      </div>
 
       <button class="exceptions-list-button" contentType="cookies"
           i18n-content="manage_exceptions"></button>
@@ -35,14 +43,18 @@
   <section>
     <h3 i18n-content="images_tab_label"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" name="images" value="allow">
-        <span i18n-content="images_allow"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="images" value="block">
-        <span i18n-content="images_block"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" name="images" value="allow">
+          <span i18n-content="images_allow"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="images" value="block">
+          <span i18n-content="images_block"></span>
+        </label>
+      </div>
 
       <button class="exceptions-list-button" contentType="images"
           i18n-content="manage_exceptions"></button>
@@ -53,14 +65,18 @@
   <section>
     <h3 i18n-content="javascript_tab_label"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" name="javascript" value="allow">
-        <span i18n-content="javascript_allow"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="javascript" value="block">
-        <span i18n-content="javascript_block"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" name="javascript" value="allow">
+          <span i18n-content="javascript_allow"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="javascript" value="block">
+          <span i18n-content="javascript_block"></span>
+        </label>
+      </div>
 
       <button class="exceptions-list-button" contentType="javascript"
           i18n-content="manage_exceptions"></button>
@@ -71,18 +87,24 @@
   <section>
     <h3 i18n-content="plugins_tab_label"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" name="plugins" value="allow">
-        <span i18n-content="plugins_allow"></span>
-      </label>
-      <label class="radio" id="click_to_play">
-        <input type="radio" name="plugins" value="ask">
-        <span i18n-content="plugins_ask"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="plugins" value="block">
-        <span i18n-content="plugins_block"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" name="plugins" value="allow">
+          <span i18n-content="plugins_allow"></span>
+        </label>
+      </div>
+      <div class="radio" id="click_to_play">
+        <label>
+          <input type="radio" name="plugins" value="ask">
+          <span i18n-content="plugins_ask"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="plugins" value="block">
+          <span i18n-content="plugins_block"></span>
+        </label>
+      </div>
 
       <button class="exceptions-list-button" contentType="plugins"
           i18n-content="manage_exceptions"></button>
@@ -96,14 +118,18 @@
   <section>
     <h3 i18n-content="popups_tab_label" class="content-settings-header"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" name="popups" value="allow">
-         <span i18n-content="popups_allow"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="popups" value="block">
-        <span i18n-content="popups_block"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" name="popups" value="allow">
+          <span i18n-content="popups_allow"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="popups" value="block">
+          <span i18n-content="popups_block"></span>
+        </label>
+      </div>
 
       <button class="exceptions-list-button" contentType="popups"
           i18n-content="manage_exceptions"></button>
@@ -114,18 +140,24 @@
   <section>
     <h3 i18n-content="location_tab_label"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" name="location" value="allow">
-        <span i18n-content="location_allow"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="location" value="ask">
-        <span i18n-content="location_ask"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="location" value="block">
-        <span i18n-content="location_block"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" name="location" value="allow">
+          <span i18n-content="location_allow"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="location" value="ask">
+          <span i18n-content="location_ask"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="location" value="block">
+          <span i18n-content="location_block"></span>
+        </label>
+      </div>
 
       <button class="exceptions-list-button" contentType="location"
           i18n-content="manage_exceptions"></button>
@@ -136,18 +168,24 @@
   <section>
     <h3 i18n-content="notifications_tab_label"></h3>
     <div>
-      <label class="radio">
-        <input type="radio" name="notifications" value="allow">
-        <span i18n-content="notifications_allow"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="notifications" value="ask">
-        <span i18n-content="notifications_ask"></span>
-      </label>
-      <label class="radio">
-        <input type="radio" name="notifications" value="block">
-        <span i18n-content="notifications_block"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input type="radio" name="notifications" value="allow">
+          <span i18n-content="notifications_allow"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="notifications" value="ask">
+          <span i18n-content="notifications_ask"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input type="radio" name="notifications" value="block">
+          <span i18n-content="notifications_block"></span>
+        </label>
+      </div>
 
       <button class="exceptions-list-button" contentType="notifications"
           i18n-content="manage_exceptions"></button>
diff --git a/chrome/browser/resources/options/language_options.css b/chrome/browser/resources/options/language_options.css
index f79fc5d..36ae7cc 100644
--- a/chrome/browser/resources/options/language_options.css
+++ b/chrome/browser/resources/options/language_options.css
@@ -14,10 +14,6 @@
   margin-top: 12px;
 }
 
-.language-options label {
-  display: block;
-}
-
 .language-options-contents  {
   -webkit-padding-start: 12px;
   -webkit-padding-end: 12px;
diff --git a/chrome/browser/resources/options/language_options.html b/chrome/browser/resources/options/language_options.html
index bd561b5..1b75cddb 100644
--- a/chrome/browser/resources/options/language_options.html
+++ b/chrome/browser/resources/options/language_options.html
@@ -51,15 +51,15 @@
     <div i18n-content="select_previous_input_method_hint"></div>
 </if>
 <if expr="not pp_ifdef('chromeos')">
-    <div id="spell-check-option">
-      <label class="checkbox">
+    <div id="spell-check-option" class="checkbox">
+      <label>
         <input id="enable-spell-check" pref="browser.enable_spellchecking"
             metric="Options_SpellCheck" type="checkbox">
         <span i18n-content="enable_spell_check"></span>
       </label>
     </div>
-    <div id="auto-spell-correction-option" class="hidden">
-      <label class="checkbox">
+    <div id="auto-spell-correction-option" class="hidden" class="checkbox">
+      <label>
         <input id="enable-auto-spell-correction"
             pref="browser.enable_autospellcorrect"
             metric="Options_AutoSpellCorrection" type="checkbox">
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index a493b9d..78484fd 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -371,18 +371,11 @@ section > div:only-of-type {
   margin-top: 0;
 }
 
-/* TODO(stuartmorgan): make this less specific once all pages
- * are converted to the non-table style.
- */
-section > div:only-of-type label {
+div.checkbox,
+div.radio {
   margin: 5px 0;
 }
 
-label.checkbox,
-label.radio {
-  display: block
-}
-
 .hidden {
   display: none !important;
 }
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index 0891c32..8c86b24 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -41,19 +41,23 @@
   <section>
     <h3 i18n-content="passwords"></h3>
     <div>
-      <label class="radio">
-        <input id="passwords-offersave"
-            pref="profile.password_manager_enabled"
-            type="radio" value="true" metric="Options_PasswordManager">
-        <span i18n-content="passwordsAskToSave"></span>
-      </label>
-      <label class="radio">
-        <input id="passwords-neversave"
-            name="passwords_radio"
-            pref="profile.password_manager_enabled"
-            type="radio" value="false" metric="Options_PasswordManager">
-        <span i18n-content="passwordsNeverSave"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input id="passwords-offersave"
+              pref="profile.password_manager_enabled"
+              type="radio" value="true" metric="Options_PasswordManager">
+          <span i18n-content="passwordsAskToSave"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input id="passwords-neversave"
+              name="passwords_radio"
+              pref="profile.password_manager_enabled"
+              type="radio" value="false" metric="Options_PasswordManager">
+          <span i18n-content="passwordsNeverSave"></span>
+        </label>
+      </div>
       <div><button id="manage-passwords"
           i18n-content="manage_passwords"></button></div>
     </div>
@@ -61,11 +65,13 @@
   <section>
     <h3 i18n-content="autofill"></h3>
     <div>
-      <label class="checkbox">
-        <input id="autoFillEnabled" pref="autofill.enabled"
-            metric="Options_FormAutofill" type="checkbox">
-        <span i18n-content="autoFillEnabled"></span>
-      </label>
+      <div class="checkbox">
+        <label>
+          <input id="autoFillEnabled" pref="autofill.enabled"
+              metric="Options_FormAutofill" type="checkbox">
+          <span i18n-content="autoFillEnabled"></span>
+        </label>
+      </div>
       <button id="autofill-settings"
           i18n-content="manageAutofillSettings"></button>
     </div>
@@ -92,18 +98,22 @@
         <a id="themes-gallery" i18n-content="themesGallery"
             i18n-values="href:themesGalleryURL" target="_blank"></a>
       </div>
-      <label class="radio">
-        <input name="decorations_radio"
-            pref="browser.custom_chrome_frame"
-            type="radio" value="false" metric="Options_CustomFrame">
-        <span i18n-content="showWindowDecorations"></span>
-      </label>
-      <label class="radio">
-        <input name="decorations_radio"
-            pref="browser.custom_chrome_frame"
-            type="radio" value="true" metric="Options_CustomFrame">
-        <span i18n-content="hideWindowDecorations"></span>
-      </label>
+      <div class="radio">
+        <label>
+          <input name="decorations_radio"
+              pref="browser.custom_chrome_frame"
+              type="radio" value="false" metric="Options_CustomFrame">
+          <span i18n-content="showWindowDecorations"></span>
+        </label>
+      </div>
+      <div class="radio">
+        <label>
+          <input name="decorations_radio"
+              pref="browser.custom_chrome_frame"
+              type="radio" value="true" metric="Options_CustomFrame">
+          <span i18n-content="hideWindowDecorations"></span>
+        </label>
+      </div>
     </div>
   </section>
 </if>