| OLD | NEW |
| 1 <div id="import-data-overlay" class="page" hidden> | 1 <div id="import-data-overlay" class="page" hidden> |
| 2 <div class="close-button"></div> | 2 <div class="close-button"></div> |
| 3 <h1 i18n-content="importDataOverlay"></h1> | 3 <h1 i18n-content="importDataOverlay"></h1> |
| 4 <div class="content-area"> | 4 <div class="content-area"> |
| 5 <div class="import-data-configure"> | 5 <div class="import-data-configure"> |
| 6 <div id="import-from-div"> | 6 <div id="import-from-div"> |
| 7 <span i18n-content="importFromLabel"></span> | 7 <span i18n-content="importFromLabel"></span> |
| 8 <select id="import-browsers"> | 8 <select id="import-browsers"> |
| 9 <option i18n-content="importLoading"></option> | 9 <option i18n-content="importLoading"></option> |
| 10 </select> | 10 </select> |
| 11 </div> | 11 </div> |
| 12 <div id="import-checkboxes"> | 12 <div id="import-checkboxes"> |
| 13 <div i18n-content="importDescription"></div> | 13 <div i18n-content="importDescription"></div> |
| 14 <div class="checkbox controlled-setting-with-label" | 14 <div class="checkbox controlled-setting-with-label" |
| 15 id="import-history-with-label"> | 15 id="import-history-with-label"> |
| 16 <label> | 16 <label> |
| 17 <input id="import-history" type="checkbox" pref="import_history"> | 17 <input id="import-history" type="checkbox" pref="import_history"> |
| 18 <span> | 18 <span i18n-content="importHistory"></span> |
| 19 <span i18n-content="importHistory"></span> | |
| 20 <span class="controlled-setting-indicator" pref="import_history"> | |
| 21 </span> | |
| 22 </span> | |
| 23 </label> | 19 </label> |
| 20 <span class="controlled-setting-indicator" pref="import_history"> |
| 21 </span> |
| 24 </div> | 22 </div> |
| 25 <div class="checkbox controlled-setting-with-label" | 23 <div class="checkbox controlled-setting-with-label" |
| 26 id="import-favorites-with-label"> | 24 id="import-favorites-with-label"> |
| 27 <label> | 25 <label> |
| 28 <input id="import-favorites" type="checkbox" | 26 <input id="import-favorites" type="checkbox" |
| 29 pref="import_bookmarks"> | 27 pref="import_bookmarks"> |
| 30 <span> | 28 <span i18n-content="importFavorites"></span> |
| 31 <span i18n-content="importFavorites"></span> | |
| 32 <span class="controlled-setting-indicator" | |
| 33 pref="import_bookmarks"></span> | |
| 34 </span> | |
| 35 </label> | 29 </label> |
| 30 <span class="controlled-setting-indicator" |
| 31 pref="import_bookmarks"></span> |
| 36 </div> | 32 </div> |
| 37 <div class="checkbox controlled-setting-with-label" | 33 <div class="checkbox controlled-setting-with-label" |
| 38 id="import-passwords-with-label"> | 34 id="import-passwords-with-label"> |
| 39 <label> | 35 <label> |
| 40 <input id="import-passwords" type="checkbox" | 36 <input id="import-passwords" type="checkbox" |
| 41 pref="import_saved_passwords"> | 37 pref="import_saved_passwords"> |
| 42 <span> | 38 <span i18n-content="importPasswords"></span> |
| 43 <span i18n-content="importPasswords"></span> | |
| 44 <span class="controlled-setting-indicator" | |
| 45 pref="import_saved_passwords"></span> | |
| 46 </span> | |
| 47 </label> | 39 </label> |
| 40 <span class="controlled-setting-indicator" |
| 41 pref="import_saved_passwords"></span> |
| 48 </div> | 42 </div> |
| 49 <div class="checkbox controlled-setting-with-label" | 43 <div class="checkbox controlled-setting-with-label" |
| 50 id="import-search-with-label"> | 44 id="import-search-with-label"> |
| 51 <label> | 45 <label> |
| 52 <input id="import-search" type="checkbox" | 46 <input id="import-search" type="checkbox" |
| 53 pref="import_search_engine"> | 47 pref="import_search_engine"> |
| 54 <span> | 48 <span i18n-content="importSearch"></span> |
| 55 <span i18n-content="importSearch"></span> | |
| 56 <span class="controlled-setting-indicator" | |
| 57 pref="import_search_engine"></span> | |
| 58 </span> | |
| 59 </label> | 49 </label> |
| 50 <span class="controlled-setting-indicator" |
| 51 pref="import_search_engine"></span> |
| 60 </div> | 52 </div> |
| 61 <div class="checkbox controlled-setting-with-label" | 53 <div class="checkbox controlled-setting-with-label" |
| 62 id="import-autofill-form-data-with-label"> | 54 id="import-autofill-form-data-with-label"> |
| 63 <label> | 55 <label> |
| 64 <input id="import-autofill-form-data" type="checkbox" | 56 <input id="import-autofill-form-data" type="checkbox" |
| 65 pref="import_autofill_form_data"> | 57 pref="import_autofill_form_data"> |
| 66 <span i18n-content="importAutofillFormData"></span> | 58 <span i18n-content="importAutofillFormData"></span> |
| 67 </label> | 59 </label> |
| 68 <span class="controlled-setting-indicator" | 60 <span class="controlled-setting-indicator" |
| 69 pref="import_autofill_form_data"></span> | 61 pref="import_autofill_form_data"></span> |
| 70 </div> | 62 </div> |
| 71 </div> | 63 </div> |
| 72 </div> | 64 </div> |
| 73 <div class="import-data-success" hidden> | 65 <div class="import-data-success" hidden> |
| 74 <div id="import-success-header"> | 66 <div id="import-success-header"> |
| 75 <strong i18n-content="importSucceeded"></strong> | 67 <strong i18n-content="importSucceeded"></strong> |
| 76 </div> | 68 </div> |
| 77 <div id="import-success-image"> | 69 <div id="import-success-image"> |
| 78 <img src="../../../../ui/webui/resources/images/success.png"> | 70 <img src="../../../../ui/webui/resources/images/success.png"> |
| 79 </div> | 71 </div> |
| 80 <div id="import-find-your-bookmarks"> | 72 <div id="import-find-your-bookmarks"> |
| 81 <span i18n-content="findYourImportedBookmarks"></span> | 73 <span i18n-content="findYourImportedBookmarks"></span> |
| 82 <div class="checkbox controlled-setting-with-label"> | 74 <div class="checkbox controlled-setting-with-label"> |
| 83 <label> | 75 <label> |
| 84 <input id="import-data-show-bookmarks-bar" | 76 <input id="import-data-show-bookmarks-bar" |
| 85 pref="bookmark_bar.show_on_all_tabs" | 77 pref="bookmark_bar.show_on_all_tabs" |
| 86 metric="Options_ShowBookmarksBar" type="checkbox"> | 78 metric="Options_ShowBookmarksBar" type="checkbox"> |
| 87 <span> | 79 <span i18n-content="toolbarShowBookmarksBar"></span> |
| 88 <span i18n-content="toolbarShowBookmarksBar"></span> | |
| 89 <span class="controlled-setting-indicator" | |
| 90 pref="bookmark_bar.show_on_all_tabs"></span> | |
| 91 </span> | |
| 92 </label> | 80 </label> |
| 81 <span class="controlled-setting-indicator" |
| 82 pref="bookmark_bar.show_on_all_tabs"></span> |
| 93 </div> | 83 </div> |
| 94 </div> | 84 </div> |
| 95 </div> | 85 </div> |
| 96 </div> | 86 </div> |
| 97 <div class="action-area"> | 87 <div class="action-area"> |
| 98 <div class="import-data-configure"> | 88 <div class="import-data-configure"> |
| 99 <div class="action-area-right"> | 89 <div class="action-area-right"> |
| 100 <div id="import-throbber" class="throbber"></div> | 90 <div id="import-throbber" class="throbber"></div> |
| 101 <div class="button-strip"> | 91 <div class="button-strip"> |
| 102 <button id="import-data-cancel" i18n-content="cancel"></button> | 92 <button id="import-data-cancel" i18n-content="cancel"></button> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 117 </div> | 107 </div> |
| 118 </div> | 108 </div> |
| 119 </div> | 109 </div> |
| 120 </div> | 110 </div> |
| 121 <if expr="is_macosx"> | 111 <if expr="is_macosx"> |
| 122 <div id="mac-password-keychain" class="gray-bottom-bar"> | 112 <div id="mac-password-keychain" class="gray-bottom-bar"> |
| 123 <span i18n-content="macPasswordKeychain"></span> | 113 <span i18n-content="macPasswordKeychain"></span> |
| 124 </div> | 114 </div> |
| 125 </if> | 115 </if> |
| 126 </div> | 116 </div> |
| OLD | NEW |