Fix labels in import data overlay.

chrome/browser/resources/options/import_data_overlay.html

Index: chrome/browser/resources/options/import_data_overlay.html
diff --git a/chrome/browser/resources/options/import_data_overlay.html b/chrome/browser/resources/options/import_data_overlay.html
index 4aca7cfcb4c843eb765681bab32d102f873d4928..b9c453fa9f95b4b421dfa84b6019b2baf4d96cb3 100644
--- a/chrome/browser/resources/options/import_data_overlay.html
+++ b/chrome/browser/resources/options/import_data_overlay.html
@@ -11,57 +11,41 @@
       </div>
       <div id="import-checkboxes">
         <div i18n-content="importDescription"></div>
-        <div class="checkbox">
-          <span id="import-history-with-label"
-              class="controlled-setting-with-label">
+        <div class="checkbox controlled-setting-with-label"
+              id="import-history-with-label">
+          <label>
             <input id="import-history" type="checkbox" pref="import_history">
-            <span>
-              <label for="import-history" i18n-content="importHistory"></label>
-              <span class="controlled-setting-indicator" pref="import_history">
-              </span>
-            </span>
-          </span>
+            <span i18n-content="importHistory"></span>
+          </label>
+          <span class="bubble-button controlled-setting-indicator"
+              pref="import_history"></span>
         </div>
-        <div class="checkbox">
-          <span id="import-favorites-with-label"
-              class="controlled-setting-with-label">
-            <input id="import-favorites" type="checkbox"
-                pref="import_bookmarks">
-            <span>
-              <label for="import-favorites" i18n-content="importFavorites">
-              </label>
-              <span class="controlled-setting-indicator"
-                  pref="import_bookmarks">
-              </span>
-            </span>
-          </span>
+        <div class="checkbox controlled-setting-with-label"
+            id="import-favorites-with-label">
+          <label>
+            <input id="import-favorites" type="checkbox" pref="import_bookmarks">
+            <span i18n-content="importFavorites"></span>
+          </label>
+          <span class="bubble-button controlled-setting-indicator"
+              pref="import_bookmarks"></span>
         </div>
-        <div class="checkbox">
-          <span id="import-passwords-with-label"
-              class="controlled-setting-with-label">
-            <input id="import-passwords" type="checkbox"
-                pref="import_saved_passwords">
-            <span>
-              <label for="import-passwords" i18n-content="importPasswords">
-              </label>
-              <span class="controlled-setting-indicator"
-                  pref="import_saved_passwords">
-              </span>
-            </span>
-          </span>
+        <div class="checkbox controlled-setting-with-label"
+            id="import-passwords-with-label">
+          <label>
+            <input id="import-passwords" type="checkbox" pref="import_passwords">
+            <span i18n-content="importPasswords"></span>
+          </label>
+          <span class="bubble-button controlled-setting-indicator"
+              pref="import_passwords"></span>
         </div>
-        <div class="checkbox">
-          <span id="import-search-with-label"
-              class="controlled-setting-with-label">
-            <input id="import-search" type="checkbox"
-                pref="import_search_engine">
-            <span>
-              <label for="import-search" i18n-content="importSearch"></label>
-              <span class="controlled-setting-indicator"
-                  pref="import_search_engine">

[dconnelly, 2014/08/29 08:16:28]

I don't think you can change these this easily. I patched this in, and loading
chrome://settings/importData hits a NOTREACHED():

[80389:1287:0829/101203:FATAL:core_options_handler.cc(373)] Check failed: false.

Maybe you're building in Release? Looks like the C++ side searches the
PrefService for Prefs that have these names.

[Evan Stade, 2014/08/29 15:15:17]

you're right, was building in release. Thanks for catching this. The pref name
changes were completely unintentional.

-              </span>
-            </span>
-          </span>
+        <div class="checkbox controlled-setting-with-label"
+            id="import-search-with-label">
+          <label>
+            <input id="import-search" type="checkbox" pref="import_search">
+            <span i18n-content="importSearch"></span>
+          </label>
+          <span class="bubble-button controlled-setting-indicator"
+              pref="import_search"></span>
         </div>
       </div>
     </div>
@@ -74,20 +58,15 @@
       </div>
       <div id="import-find-your-bookmarks">
         <span i18n-content="findYourImportedBookmarks"></span>
-        <div class="checkbox">
-          <span class="controlled-setting-with-label">
+        <div class="checkbox controlled-setting-with-label">
+          <label>
             <input id="import-data-show-bookmarks-bar"
                 pref="bookmark_bar.show_on_all_tabs"
                 metric="Options_ShowBookmarksBar" type="checkbox">
-            <span>
-              <label for="import-data-show-bookmarks-bar"
-                  i18n-content="toolbarShowBookmarksBar">
-              </label>
-              <span class="controlled-setting-indicator"
-                  pref="bookmark_bar.show_on_all_tabs">
-              </span>
-            </span>
-          </span>
+            <span i18n-content="toolbarShowBookmarksBar"></span>
+          </label>
+          <span class="bubble-button controlled-setting-indicator"
+              pref="bookmark_bar.show_on_all_tabs"></span>
         </div>
       </div>
     </div>