Reland r55881: Disable the 'Clear browsing Data' button when no checkboxes are checked.

chrome/browser/resources/options/clear_browser_data_overlay.html

Index: chrome/browser/resources/options/clear_browser_data_overlay.html
diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html
index 2e5e3ba1962144d391ecac12b63cd339698f0d13..19ac5b30429fe9b1c4341d80491553441e50c78f 100644
--- a/chrome/browser/resources/options/clear_browser_data_overlay.html
+++ b/chrome/browser/resources/options/clear_browser_data_overlay.html
@@ -1,56 +1,59 @@
 <div class="page hidden" id="clearBrowserDataOverlay">
   <h1 i18n-content="clearBrowsingDataTitle"></h1>
   <h3 i18n-content="clearBrowsingDataLabel"></h3>
-  <table class="option-control-table">
-    <tr>
-      <td class="option-name"><label><input id="deleteBrowsingHistoryCheckbox"
-          pref="browser.clear_data.browsing_history" type="checkbox"><span
-          i18n-content="deleteBrowsingHistoryCheckbox"></span></label></td>
-    </tr>
-    <tr>
-      <td class="option-name"><label><input id="deleteDownloadHistoryCheckbox"
-          pref="browser.clear_data.download_history" type="checkbox"><span
-          i18n-content="deleteDownloadHistoryCheckbox"></span></label></td>
-    </tr>
-    <tr>
-      <td class="option-name"><label><input id="deleteCacheCheckbox"
-          pref="browser.clear_data.cache" type="checkbox"><span
-          i18n-content="deleteCacheCheckbox"></span></label>
-      </td>
-    </tr>
-    <tr>
-      <td class="option-name"><label><input id="deleteCookiesCheckbox"
-          pref="browser.clear_data.cookies" type="checkbox"><span
-          i18n-content="deleteCookiesCheckbox"></span></label></td>
-    </tr>
-    <tr>
-      <td class="option-name"><label><input id="deletePasswordsCheckbox"
-          pref="browser.clear_data.passwords" type="checkbox"><span
-          i18n-content="deletePasswordsCheckbox"></span></label></td>
-    </tr>
-    <tr>
-      <td class="option-name"><label><input id="deleteFormDataCheckbox"
-          pref="browser.clear_data.form_data" type="checkbox"><span
-          i18n-content="deleteFormDataCheckbox"></span></label></td>
-    </tr>
-    <tr>
-      <td>
-        <label><span i18n-content="clearBrowsingDataTimeLabel"></span>
+  <div id="checkboxListData">
+    <label>
+      <input id="deleteBrowsingHistoryCheckbox"
+             pref="browser.clear_data.browsing_history" type="checkbox">
+      <span i18n-content="deleteBrowsingHistoryCheckbox"></span>
+    </label>
+    <label>
+      <input id="deleteDownloadHistoryCheckbox"
+             pref="browser.clear_data.download_history" type="checkbox">
+      <span i18n-content="deleteDownloadHistoryCheckbox"></span>
+    </label>
+    <label>
+      <input id="deleteCacheCheckbox"
+             pref="browser.clear_data.cache" type="checkbox">
+      <span i18n-content="deleteCacheCheckbox"></span>
+    </label>
+    <label>
+      <input id="deleteCookiesCheckbox"
+             pref="browser.clear_data.cookies" type="checkbox">
+      <span i18n-content="deleteCookiesCheckbox"></span>
+    </label>
+    <label>
+      <input id="deletePasswordsCheckbox"
+             pref="browser.clear_data.passwords" type="checkbox">
+      <span i18n-content="deletePasswordsCheckbox"></span>
+    </label>
+    <label>
+      <input id="deleteFormDataCheckbox"
+             pref="browser.clear_data.form_data" type="checkbox">
+      <span i18n-content="deleteFormDataCheckbox"></span>
+    </label>
+  </div>
+  <div>
+    <div>
+      <label>
+        <span i18n-content="clearBrowsingDataTimeLabel"></span>
         <select id="clearBrowsingDataTimePeriod"
-            pref="browser.clear_data.time_period"></select></label>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span id="cbdThrobber"></span>
-        <button id="clearBrowsingDataCommit"
-            i18n-content="clearBrowsingDataCommit"></button>
-        <button id="clearBrowsingDataDismiss" i18n-content="cancel"
+                pref="browser.clear_data.time_period"></select>
+      </label>
+    </div>
+    <span id="cbdThrobber"></span>
+    <if expr="os == 'win32'">
+      <button id="clearBrowsingDataCommit"
+              i18n-content="clearBrowsingDataCommit"></button>
+    </if>
+    <button id="clearBrowsingDataDismiss" i18n-content="cancel"
             onclick="ClearBrowserDataOverlay.dismiss();">
-        </button>
-      </td>
-    </tr>
-  </table>
+    </button>
+    <if expr="os != 'win32'">
+      <button id="clearBrowsingDataCommit"
+              i18n-content="clearBrowsingDataCommit"></button>
+    </if>
+  </div>
   <hr>
   <a target="_blank" i18n-content="flash_storage_settings"
       i18n-values="href:flash_storage_url"></a>