Standardize size of WebUI controls for touch and non-touch.

chrome/browser/resources/options2/browser_options.html

 <div id="settings" class="page" hidden>
   <header>
     <h1 i18n-content="settingsTitle"></h1>
   </header>
 <if expr="not pp_ifdef('chromeos')">
   <include src="sync_section.html">
 </if>
 <if expr="pp_ifdef('chromeos')">
   <section>
     <h3 i18n-content="sectionTitleInternet"></h3>
@@ skipping 11 matching lines @@
       </div>
       <div id="network-menus"></div>
     </div>
   </section>
 </if>
 <if expr="not pp_ifdef('chromeos')">
   <include src="startup_section.html">
 </if>
   <section>
     <h3 i18n-content="sectionTitleAppearance"></h3>
-    <div>
+    <div class="settings-row">
 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
       <button id="set-wallpaper" i18n-content="setWallpaper"
           guest-visibility="disabled"></button>
 </if>
 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
       <button id="themes-gallery" i18n-content="themesGallery"></button>
       <button id="themes-GTK-button"
           i18n-content="themesGTKButton"></button>
       <button id="themes-reset"
           i18n-content="themesSetClassic"></button>
@@ skipping 149 matching lines @@
 </if>
   <section>
     <h3 i18n-content="advancedSectionTitlePrivacy"></h3>
     <div>
       <div class="settings-row">
         <button id="privacyContentSettingsButton"
             i18n-content="privacyContentSettingsButton"></button>
         <button id="privacyClearDataButton"
             i18n-content="privacyClearDataButton"></button>
       </div>
-      <div id="privacy-explanation" class="settings-row">
+      <p id="privacy-explanation" class="settings-row">
         <span i18n-content="improveBrowsingExperience"></span>
         <span i18n-content="disableWebServices"></span>
         <a target="_blank" i18n-content="learnMore"
             i18n-values="href:privacyLearnMoreURL"></a>
-      </div>
+      </p>
       <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" guest-visibility="disabled">
         <label>
@@ skipping 160 matching lines @@
       <div class="settings-row">
         <button id="proxiesConfigureButton"
             i18n-content="proxiesConfigureButton"></button>
       </div>
     </div>
   </section>
 </if>
   <section>
     <h3 i18n-content="advancedSectionTitleLanguages"></h3>
     <span class="settings-row" i18n-content="languageSectionLabel"></span>
-    <button id="language-button"
-        i18n-content="languageAndSpellCheckSettingsButton"></button>
+    <div class="settings-row">
+      <button id="language-button"
+          i18n-content="languageAndSpellCheckSettingsButton"></button>
+    </div>
     <div class="checkbox">
       <label>
         <input id="enableTranslate" pref="translate.enabled"
             metric="Options_Translate" type="checkbox">
         <span i18n-content="translateEnableTranslate"></span>
       </label>
     </div>
   </section>
   <section>
     <h3 i18n-content="downloadLocationGroupName"></h3>
@@ skipping 52 matching lines @@
             <input id="sslCheckRevocation" type="checkbox">
             <span i18n-content="sslCheckRevocation"></span>
           </label>
         </div>
       </div>
     </section>
 <if expr="not pp_ifdef('chromeos')">
     <section id="cloud-print-connector-section">
       <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
       <div>
-        <span id="cloudPrintConnectorLabel" class="settings-row"
-             i18n-content="cloudPrintConnectorDisabledLabel"></span>
+        <p id="cloudPrintConnectorLabel" class="settings-row"
+             i18n-content="cloudPrintConnectorDisabledLabel"></p>
         <div class="settings-row">
           <button id="cloudPrintConnectorSetupButton"
               i18n-content="cloudPrintConnectorDisabledButton"></button>
           <button id="cloudPrintManageButton"
               i18n-content="cloudPrintConnectorEnabledManageButton"></button>
         </div>
       </div>
     </section>
 </if>
 <if expr="pp_ifdef('chromeos')">
@@ skipping 56 matching lines @@
   </section>
 </if>
 </div>  <!-- advanced-settings-container -->
 </div>  <!-- advanced-settings -->
 <footer>
   <button id="advanced-settings-expander" class="link-button"
       i18n-content="showAdvancedSettings">
   </button>
 </footer>
 </div>