| OLD | NEW |
| 1 <div id="browserPage" class="page hidden"> | 1 <div id="browserPage" class="page hidden"> |
| 2 <h1 i18n-content="browserPage"></h1> | 2 <h1 i18n-content="browserPage"></h1> |
| 3 <section id="startupSection"> | 3 <section id="startupSection"> |
| 4 <h3 i18n-content="startupGroupName"></h3> | 4 <h3 i18n-content="startupGroupName"></h3> |
| 5 <div> | 5 <div> |
| 6 <label class="radio"><input type="radio" name="startup" | 6 <div class="radio"> |
| 7 pref="session.restore_on_startup" value="0" | 7 <label> |
| 8 metric="Options_Startup_Homepage"> | 8 <input type="radio" name="startup" pref="session.restore_on_startup" |
| 9 <span i18n-content="startupShowDefaultAndNewTab"></span></label> | 9 value="0" metric="Options_Startup_Homepage"> |
| 10 <label class="radio"><input type="radio" name="startup" | 10 <span i18n-content="startupShowDefaultAndNewTab"></span> |
| 11 pref="session.restore_on_startup" value="1" | 11 </label> |
| 12 metric="Options_Startup_LastSession"> | 12 </div> |
| 13 <span i18n-content="startupShowLastSession"></span></label> | 13 <div class="radio"> |
| 14 <label class="radio"><input type="radio" name="startup" id="startupShowPag
esButton" | 14 <label> |
| 15 pref="session.restore_on_startup" value="4" | 15 <input type="radio" name="startup" pref="session.restore_on_startup" |
| 16 metric="Options_Startup_Custom"> | 16 value="1" metric="Options_Startup_LastSession"> |
| 17 <span i18n-content="startupShowLastSession"></span> |
| 18 </label> |
| 19 </div> |
| 20 <div class="radio"> |
| 21 <label> |
| 22 <input type="radio" name="startup" id="startupShowPagesButton" |
| 23 pref="session.restore_on_startup" value="4" |
| 24 metric="Options_Startup_Custom"> |
| 17 <span id="startupShowPagesLabel" | 25 <span id="startupShowPagesLabel" |
| 18 i18n-content="startupShowPages"></span></label> | 26 i18n-content="startupShowPages"></span> |
| 27 </label> |
| 28 </div> |
| 19 <div class="suboption"> | 29 <div class="suboption"> |
| 20 <div id="startupPageManagement" class="settings-list"> | 30 <div id="startupPageManagement" class="settings-list"> |
| 21 <list id="startupPagesList"></list> | 31 <list id="startupPagesList"></list> |
| 22 <div> | 32 <div> |
| 23 <button id="startupAddButton" | 33 <button id="startupAddButton" |
| 24 i18n-content="startupAddButton"></button> | 34 i18n-content="startupAddButton"></button> |
| 25 <button id="startupUseCurrentButton" | 35 <button id="startupUseCurrentButton" |
| 26 i18n-content="startupUseCurrent"></button> | 36 i18n-content="startupUseCurrent"></button> |
| 27 </div> | 37 </div> |
| 28 </div> | 38 </div> |
| 29 </div> | 39 </div> |
| 30 </div> | 40 </div> |
| 31 </section> | 41 </section> |
| 32 <section> | 42 <section> |
| 33 <h3 i18n-content="homepageGroupName"></h3> | 43 <h3 i18n-content="homepageGroupName"></h3> |
| 34 <div> | 44 <div> |
| 35 <label class="radio"> | 45 <div class="radio"> |
| 36 <input type="radio" name="homepage" id="homepageUseNTPButton" | 46 <label> |
| 37 value="true" metric="Options_Homepage_IsNewTabPage"> | 47 <input type="radio" name="homepage" id="homepageUseNTPButton" |
| 38 <span i18n-content="homepageUseNewTab"></span> | 48 value="true" metric="Options_Homepage_IsNewTabPage"> |
| 39 </label> | 49 <span i18n-content="homepageUseNewTab"></span> |
| 50 </label> |
| 51 </div> |
| 40 <div id="customHomePageGroup"> | 52 <div id="customHomePageGroup"> |
| 41 <label class="radio"> | 53 <div class="radio"> |
| 42 <input type="radio" name="homepage" id="homepageUseURLButton" | 54 <label> |
| 43 value="false" metric="Options_Homepage_IsNewTabPage"> | 55 <input type="radio" name="homepage" id="homepageUseURLButton" |
| 44 <span i18n-content="homepageUseURL"></span> | 56 value="false" metric="Options_Homepage_IsNewTabPage"> |
| 45 </label> | 57 <span i18n-content="homepageUseURL"></span> |
| 58 </label> |
| 59 </div> |
| 46 <div> | 60 <div> |
| 47 <input id="homepageURL" class="favicon-cell" type="url"> | 61 <input id="homepageURL" class="favicon-cell" type="url"> |
| 48 </div> | 62 </div> |
| 49 </div> | 63 </div> |
| 50 </div> | 64 </div> |
| 51 </section> | 65 </section> |
| 52 <section> | 66 <section> |
| 53 <h3 i18n-content="toolbarGroupName"></h3> | 67 <h3 i18n-content="toolbarGroupName"></h3> |
| 54 <div> | 68 <div> |
| 55 <div class="option"> | 69 <div class="checkbox"> |
| 56 <label class="checkbox"> | 70 <label> |
| 57 <input id="toolbarShowHomeButton" pref="browser.show_home_button" | 71 <input id="toolbarShowHomeButton" pref="browser.show_home_button" |
| 58 metric="Options_Homepage_HomeButton" type="checkbox"> | 72 metric="Options_Homepage_HomeButton" type="checkbox"> |
| 59 <span i18n-content="toolbarShowHomeButton"></span> | 73 <span i18n-content="toolbarShowHomeButton"></span> |
| 60 </label> | 74 </label> |
| 61 </div> | 75 </div> |
| 62 </div> | 76 </div> |
| 63 </section> | 77 </section> |
| 64 <section> | 78 <section> |
| 65 <h3 i18n-content="defaultSearchGroupName"></h3> | 79 <h3 i18n-content="defaultSearchGroupName"></h3> |
| 66 <div id="defaultSearchEngineGroup"> | 80 <div id="defaultSearchEngineGroup"> |
| 67 <div> | 81 <div> |
| 68 <select id="defaultSearchEngine"></select> | 82 <select id="defaultSearchEngine"></select> |
| 69 <button id="defaultSearchManageEnginesButton" | 83 <button id="defaultSearchManageEnginesButton" |
| 70 i18n-content="defaultSearchManageEngines"></button> | 84 i18n-content="defaultSearchManageEngines"></button> |
| 71 </div> | 85 </div> |
| 72 <label class="checkbox" id="instantOption"> | 86 <div class="checkbox" id="instantOption"> |
| 73 <!-- TODO(estade): metric? --> | 87 <label> |
| 74 <input type="checkbox" id="instantEnableCheckbox" | 88 <!-- TODO(estade): metric? --> |
| 75 pref="instant.enabled"> | 89 <input type="checkbox" id="instantEnableCheckbox" |
| 76 <span i18n-content="instantName"></span> | 90 pref="instant.enabled"> |
| 77 <!-- This hidden checkbox allows us to get/set the state of the | 91 <span i18n-content="instantName"></span> |
| 78 confirm_dialog_shown pref --> | 92 <!-- This hidden checkbox allows us to get/set the state of the |
| 79 <input type="checkbox" class="hidden" id="instantDialogShown" | 93 confirm_dialog_shown pref --> |
| 80 pref="instant.confirm_dialog_shown"> | 94 <input type="checkbox" class="hidden" id="instantDialogShown" |
| 81 </label> | 95 pref="instant.confirm_dialog_shown"> |
| 96 </label> |
| 97 </div> |
| 82 <div class="suboption"> | 98 <div class="suboption"> |
| 83 <span i18n-content="instantWarningText"></span> | 99 <span i18n-content="instantWarningText"></span> |
| 84 <a target="_blank" i18n-values="href:instantLearnMoreLink" | 100 <a target="_blank" i18n-values="href:instantLearnMoreLink" |
| 85 i18n-content="learnMore"></a> | 101 i18n-content="learnMore"></a> |
| 86 </div> | 102 </div> |
| 87 </div> | 103 </div> |
| 88 </section> | 104 </section> |
| 89 <if expr="not pp_ifdef('chromeos')"> | 105 <if expr="not pp_ifdef('chromeos')"> |
| 90 <section> | 106 <section> |
| 91 <h3 i18n-content="defaultBrowserGroupName"></h3> | 107 <h3 i18n-content="defaultBrowserGroupName"></h3> |
| 92 <div> | 108 <div> |
| 93 <button id="defaultBrowserUseAsDefaultButton" | 109 <button id="defaultBrowserUseAsDefaultButton" |
| 94 i18n-content="defaultBrowserUseAsDefault"></button> | 110 i18n-content="defaultBrowserUseAsDefault"></button> |
| 95 <div id="defaultBrowserState" | 111 <div id="defaultBrowserState" |
| 96 i18n-content="defaultBrowserUnknown"></div> | 112 i18n-content="defaultBrowserUnknown"></div> |
| 97 </div> | 113 </div> |
| 98 </section> | 114 </section> |
| 99 </if> | 115 </if> |
| 100 </div> | 116 </div> |
| OLD | NEW |