| OLD | NEW |
| 1 <div id="settings" class="page" hidden> | 1 <div id="settings" class="page" hidden> |
| 2 <header> | 2 <header> |
| 3 <h1 i18n-content="settingsTitle"></h1> | 3 <h1 i18n-content="settingsTitle"></h1> |
| 4 <span id="browser-options-search-field-container" | 4 <span id="browser-options-search-field-container" |
| 5 class="search-field-container"> | 5 class="search-field-container"> |
| 6 <input id="search-field" type="search" | 6 <input id="search-field" type="search" |
| 7 i18n-values="placeholder:searchPlaceholder; | 7 i18n-values="placeholder:searchPlaceholder; |
| 8 aria-label:searchPlaceholder" incremental> | 8 aria-label:searchPlaceholder" incremental> |
| 9 </span> | 9 </span> |
| 10 </header> | 10 </header> |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 <button id="themes-GTK-button" | 101 <button id="themes-GTK-button" |
| 102 i18n-content="themesGTKButton"></button> | 102 i18n-content="themesGTKButton"></button> |
| 103 <button id="themes-reset" | 103 <button id="themes-reset" |
| 104 i18n-content="themesSetClassic"></button> | 104 i18n-content="themesSetClassic"></button> |
| 105 </if> | 105 </if> |
| 106 <if expr="pp_ifdef('toolkit_views') or is_win or is_macosx"> | 106 <if expr="pp_ifdef('toolkit_views') or is_win or is_macosx"> |
| 107 <button id="themes-gallery" i18n-content="themesGallery"></button> | 107 <button id="themes-gallery" i18n-content="themesGallery"></button> |
| 108 <button id="themes-reset" i18n-content="themesReset"></button> | 108 <button id="themes-reset" i18n-content="themesReset"></button> |
| 109 </if> | 109 </if> |
| 110 </div> | 110 </div> |
| 111 <div class="checkbox"><label> | 111 <div class="checkbox" guest-visibility="disabled"><label> |
| 112 <input id="show-home-button" type="checkbox" | 112 <input id="show-home-button" type="checkbox" |
| 113 pref="browser.show_home_button" metric="Options_Homepage_HomeButton"> | 113 pref="browser.show_home_button" metric="Options_Homepage_HomeButton"> |
| 114 <span i18n-content="homePageShowHomeButton"></span> | 114 <span i18n-content="homePageShowHomeButton"></span> |
| 115 </label></div> | 115 </label></div> |
| 116 <div id="change-home-page-section" hidden> | 116 <div id="change-home-page-section" hidden> |
| 117 <div id="change-home-page-section-container"> | 117 <div id="change-home-page-section-container" guest-visibility="disabled"> |
| 118 <span id="home-page-ntp" class="home-page-label" | 118 <span id="home-page-ntp" class="home-page-label" |
| 119 i18n-content="homePageNtp"></span> | 119 i18n-content="homePageNtp"></span> |
| 120 <span id="home-page-url" class="home-page-label"></span> | 120 <span id="home-page-url" class="home-page-label"></span> |
| 121 <button id="change-home-page" class="link-button" | 121 <button id="change-home-page" class="link-button" |
| 122 i18n-content="changeHomePage"></button> | 122 i18n-content="changeHomePage"></button> |
| 123 </div> | 123 </div> |
| 124 </div> | 124 </div> |
| 125 <div class="checkbox"><label> | 125 <div class="checkbox" guest-visibility="disabled"><label> |
| 126 <input type="checkbox" pref="bookmark_bar.show_on_all_tabs" | 126 <input type="checkbox" pref="bookmark_bar.show_on_all_tabs" |
| 127 metric="Options_ShowBookmarksBar"> | 127 metric="Options_ShowBookmarksBar"> |
| 128 <span i18n-content="toolbarShowBookmarksBar"></span> | 128 <span i18n-content="toolbarShowBookmarksBar"></span> |
| 129 </label></div> | 129 </label></div> |
| 130 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> | 130 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> |
| 131 <div class="checkbox"><label> | 131 <div class="checkbox"><label> |
| 132 <input id="show-window-decorations" type="checkbox" | 132 <input id="show-window-decorations" type="checkbox" |
| 133 pref="browser.custom_chrome_frame" metric="Options_CustomFrame" | 133 pref="browser.custom_chrome_frame" metric="Options_CustomFrame" |
| 134 inverted_pref> | 134 inverted_pref> |
| 135 <span i18n-content="showWindowDecorations"></span> | 135 <span i18n-content="showWindowDecorations"></span> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 162 <div> | 162 <div> |
| 163 <span class="settings-row" | 163 <span class="settings-row" |
| 164 i18n-values=".innerHTML:defaultSearchGroupLabel"> | 164 i18n-values=".innerHTML:defaultSearchGroupLabel"> |
| 165 </span> | 165 </span> |
| 166 <div class="settings-row"> | 166 <div class="settings-row"> |
| 167 <select id="default-search-engine" class="weakrtl"></select> | 167 <select id="default-search-engine" class="weakrtl"></select> |
| 168 <button id="manage-default-search-engines" | 168 <button id="manage-default-search-engines" |
| 169 i18n-content="defaultSearchManageEngines"> | 169 i18n-content="defaultSearchManageEngines"> |
| 170 </button> | 170 </button> |
| 171 </div> | 171 </div> |
| 172 <div class="checkbox"> | 172 <div class="checkbox" guest-visibility="disabled"> |
| 173 <label id="instant-label"> | 173 <label id="instant-label"> |
| 174 <!-- TODO(estade): metric? --> | 174 <!-- TODO(estade): metric? --> |
| 175 <input id="instant-field-trial-control" type="checkbox" | 175 <input id="instant-field-trial-control" type="checkbox" |
| 176 checked="checked" hidden> | 176 checked="checked" hidden> |
| 177 <input id="instant-enabled-control" type="checkbox" | 177 <input id="instant-enabled-control" type="checkbox" |
| 178 pref="instant.enabled"> | 178 pref="instant.enabled"> |
| 179 <!-- TODO(estade) There's a link in here which should not be inside | 179 <!-- TODO(estade) There's a link in here which should not be inside |
| 180 a <label>. --> | 180 a <label>. --> |
| 181 <span i18n-values=".innerHTML:instantPrefAndWarning"></span> | 181 <span i18n-values=".innerHTML:instantPrefAndWarning"></span> |
| 182 </label> | 182 </label> |
| 183 </div> | 183 </div> |
| 184 </div> | 184 </div> |
| 185 </section> | 185 </section> |
| 186 <section> | 186 <section guest-visibility="hidden"> |
| 187 <h3 i18n-content="sectionTitleUsers"></h3> | 187 <h3 i18n-content="sectionTitleUsers"></h3> |
| 188 <if expr="pp_ifdef('chromeos')"> | 188 <if expr="pp_ifdef('chromeos')"> |
| 189 <div id="sync-section"> | 189 <div id="sync-section"> |
| 190 <div id="sync-overview" class="settings-row" hidden> | 190 <div id="sync-overview" class="settings-row" hidden> |
| 191 <p i18n-content="syncOverview"></p> | 191 <p i18n-content="syncOverview"></p> |
| 192 <a i18n-values="href:syncLearnMoreURL" i18n-content="learnMore"></a> | 192 <a i18n-values="href:syncLearnMoreURL" i18n-content="learnMore"></a> |
| 193 </div> | 193 </div> |
| 194 <div id="account-picture-wrapper"> | 194 <div id="account-picture-wrapper"> |
| 195 <img id="account-picture" | 195 <img id="account-picture" |
| 196 src="chrome://theme/IDR_PROFILE_PICTURE_LOADING"> | 196 src="chrome://theme/IDR_PROFILE_PICTURE_LOADING"> |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 </div> | 258 </div> |
| 259 </div> | 259 </div> |
| 260 </section> | 260 </section> |
| 261 </if> | 261 </if> |
| 262 <div id="advanced-settings" hidden> | 262 <div id="advanced-settings" hidden> |
| 263 <div id="advanced-settings-container"> | 263 <div id="advanced-settings-container"> |
| 264 <if expr="pp_ifdef('chromeos')"> | 264 <if expr="pp_ifdef('chromeos')"> |
| 265 <section> | 265 <section> |
| 266 <h3 i18n-content="datetimeTitle"></h3> | 266 <h3 i18n-content="datetimeTitle"></h3> |
| 267 <div class="option-control-table"> | 267 <div class="option-control-table"> |
| 268 <span class="option-name" i18n-content="timezone"></span> | 268 <div guest-visibility="disabled"> |
| 269 <div id="timezone-value"> | 269 <span class="option-name" i18n-content="timezone"></span> |
| 270 <select id="timezone-select" class="control" i18n-options="timezoneList" | 270 <div id="timezone-value"> |
| 271 data-type="string" pref="cros.system.timezone"></select> | 271 <select id="timezone-select" class="control" |
| 272 i18n-options="timezoneList" data-type="string" |
| 273 pref="cros.system.timezone"> |
| 274 </select> |
| 275 </div> |
| 272 </div> | 276 </div> |
| 273 <div class="checkbox"> | 277 <div class="checkbox"> |
| 274 <label> | 278 <label> |
| 275 <input id="use-24hour-clock" pref="settings.clock.use_24hour_clock" | 279 <input id="use-24hour-clock" pref="settings.clock.use_24hour_clock" |
| 276 type="checkbox"> | 280 type="checkbox"> |
| 277 <span i18n-content="use24HourClock"></span> | 281 <span i18n-content="use24HourClock"></span> |
| 278 </label> | 282 </label> |
| 279 </div> | 283 </div> |
| 280 </div> | 284 </div> |
| 281 </section> | 285 </section> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 300 i18n-values="href:privacyLearnMoreURL"></a> | 304 i18n-values="href:privacyLearnMoreURL"></a> |
| 301 </div> | 305 </div> |
| 302 <div class="checkbox"> | 306 <div class="checkbox"> |
| 303 <label> | 307 <label> |
| 304 <input id="alternateErrorPagesEnabled" | 308 <input id="alternateErrorPagesEnabled" |
| 305 pref="alternate_error_pages.enabled" | 309 pref="alternate_error_pages.enabled" |
| 306 metric="Options_LinkDoctorCheckbox" type="checkbox"> | 310 metric="Options_LinkDoctorCheckbox" type="checkbox"> |
| 307 <span i18n-content="linkDoctorPref"></span> | 311 <span i18n-content="linkDoctorPref"></span> |
| 308 </label> | 312 </label> |
| 309 </div> | 313 </div> |
| 310 <div class="checkbox"> | 314 <div class="checkbox" guest-visibility="disabled"> |
| 311 <label> | 315 <label> |
| 312 <input id="searchSuggestEnabled" pref="search.suggest_enabled" | 316 <input id="searchSuggestEnabled" pref="search.suggest_enabled" |
| 313 metric="Options_UseSuggestCheckbox" type="checkbox"> | 317 metric="Options_UseSuggestCheckbox" type="checkbox"> |
| 314 <span i18n-content="suggestPref"></span> | 318 <span i18n-content="suggestPref"></span> |
| 315 </label> | 319 </label> |
| 316 </div> | 320 </div> |
| 317 <div class="checkbox"> | 321 <div class="checkbox" guest-visibility="disabled"> |
| 318 <label> | 322 <label> |
| 319 <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled" | 323 <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled" |
| 320 metric="Options_DnsPrefetchCheckbox" type="checkbox"> | 324 metric="Options_DnsPrefetchCheckbox" type="checkbox"> |
| 321 <span i18n-content="networkPredictionEnabledDescription"></span> | 325 <span i18n-content="networkPredictionEnabledDescription"></span> |
| 322 </label> | 326 </label> |
| 323 </div> | 327 </div> |
| 324 <div class="checkbox"> | 328 <div class="checkbox"> |
| 325 <label> | 329 <label> |
| 326 <input id="safeBrowsingEnabled" pref="safebrowsing.enabled" | 330 <input id="safeBrowsingEnabled" pref="safebrowsing.enabled" |
| 327 metric="Options_SafeBrowsingCheckbox" type="checkbox"> | 331 metric="Options_SafeBrowsingCheckbox" type="checkbox"> |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 </div> | 551 </div> |
| 548 <div class="settings-row"> | 552 <div class="settings-row"> |
| 549 <button id="cloudPrintManageButton" | 553 <button id="cloudPrintManageButton" |
| 550 i18n-content="cloudPrintChromeosOptionButton"></button> | 554 i18n-content="cloudPrintChromeosOptionButton"></button> |
| 551 </div> | 555 </div> |
| 552 </div> | 556 </div> |
| 553 </section> | 557 </section> |
| 554 <if expr="pp_ifdef('chromeos')"> | 558 <if expr="pp_ifdef('chromeos')"> |
| 555 <!-- This section is duplicated here for ChromeOS. This must stay in sync | 559 <!-- This section is duplicated here for ChromeOS. This must stay in sync |
| 556 with the section above. --> | 560 with the section above. --> |
| 557 <section id="startup-section"> | 561 <section id="startup-section" guest-visibility="hidden"> |
| 558 <h3 i18n-content="sectionTitleStartup"></h3> | 562 <h3 i18n-content="sectionTitleStartup"></h3> |
| 559 <div> | 563 <div> |
| 560 <div class="radio"> | 564 <div class="radio"> |
| 561 <label> | 565 <label> |
| 562 <input type="radio" name="startup" value="5" | 566 <input type="radio" name="startup" value="5" |
| 563 pref="session.restore_on_startup" | 567 pref="session.restore_on_startup" |
| 564 metric="Options_Startup_NewTab"> | 568 metric="Options_Startup_NewTab"> |
| 565 <span i18n-content="startupShowNewTab"></span> | 569 <span i18n-content="startupShowNewTab"></span> |
| 566 </label> | 570 </label> |
| 567 </div> | 571 </div> |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 </section> | 623 </section> |
| 620 </if> | 624 </if> |
| 621 </div> <!-- advanced-settings-container --> | 625 </div> <!-- advanced-settings-container --> |
| 622 </div> <!-- advanced-settings --> | 626 </div> <!-- advanced-settings --> |
| 623 <footer> | 627 <footer> |
| 624 <button id="advanced-settings-expander" class="link-button" | 628 <button id="advanced-settings-expander" class="link-button" |
| 625 i18n-content="showAdvancedSettings"> | 629 i18n-content="showAdvancedSettings"> |
| 626 </button> | 630 </button> |
| 627 </footer> | 631 </footer> |
| 628 </div> | 632 </div> |
| OLD | NEW |