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 </header> | 4 </header> |
5 <if expr="not pp_ifdef('chromeos')"> | 5 <if expr="not pp_ifdef('chromeos')"> |
6 <include src="sync_section.html"> | 6 <include src="sync_section.html"> |
7 </if> | 7 </if> |
8 <if expr="pp_ifdef('chromeos')"> | 8 <if expr="pp_ifdef('chromeos')"> |
9 <section> | 9 <section> |
10 <h3 i18n-content="sectionTitleInternet"></h3> | 10 <h3 i18n-content="sectionTitleInternet"></h3> |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 </div> | 62 </div> |
63 <div id="change-home-page-section" hidden> | 63 <div id="change-home-page-section" hidden> |
64 <div id="change-home-page-section-container" guest-visibility="disabled"> | 64 <div id="change-home-page-section-container" guest-visibility="disabled"> |
65 <span id="home-page-ntp" class="home-page-label" | 65 <span id="home-page-ntp" class="home-page-label" |
66 i18n-content="homePageNtp"></span> | 66 i18n-content="homePageNtp"></span> |
67 <span id="home-page-url" class="home-page-label"></span> | 67 <span id="home-page-url" class="home-page-label"></span> |
68 <button id="change-home-page" class="link-button" | 68 <button id="change-home-page" class="link-button" |
69 i18n-content="changeHomePage"></button> | 69 i18n-content="changeHomePage"></button> |
70 </div> | 70 </div> |
71 </div> | 71 </div> |
72 <div class="checkbox" guest-visibility="disabled"><label> | 72 <div class="checkbox" guest-visibility="disabled"> |
73 <input type="checkbox" pref="bookmark_bar.show_on_all_tabs" | 73 <span class="controlled-setting-with-label"> |
| 74 <input id="show-bookmark-bars" type="checkbox" |
| 75 pref="bookmark_bar.show_on_all_tabs" |
74 metric="Options_ShowBookmarksBar"> | 76 metric="Options_ShowBookmarksBar"> |
75 <span i18n-content="toolbarShowBookmarksBar"></span> | 77 <span> |
76 </label></div> | 78 <label for="show-bookmark-bars" |
| 79 i18n-content="toolbarShowBookmarksBar"> |
| 80 </label> |
| 81 <span class="controlled-setting-indicator" |
| 82 pref="bookmark_bar.show_on_all_tabs"> |
| 83 </span> |
| 84 </span> |
| 85 </span> |
| 86 </div> |
77 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> | 87 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> |
78 <div class="checkbox"><label> | 88 <div class="checkbox"><label> |
79 <input id="show-window-decorations" type="checkbox" | 89 <input id="show-window-decorations" type="checkbox" |
80 pref="browser.custom_chrome_frame" metric="Options_CustomFrame" | 90 pref="browser.custom_chrome_frame" metric="Options_CustomFrame" |
81 inverted_pref> | 91 inverted_pref> |
82 <span i18n-content="showWindowDecorations"></span> | 92 <span i18n-content="showWindowDecorations"></span> |
83 </label></div> | 93 </label></div> |
84 </if> | 94 </if> |
85 </section> | 95 </section> |
86 <if expr="pp_ifdef('chromeos')"> | 96 <if expr="pp_ifdef('chromeos')"> |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 <div class="settings-row"> | 136 <div class="settings-row"> |
127 <select id="default-search-engine" class="weakrtl"></select> | 137 <select id="default-search-engine" class="weakrtl"></select> |
128 <span class="controlled-setting-indicator" | 138 <span class="controlled-setting-indicator" |
129 pref="default_search_provider.enabled"> | 139 pref="default_search_provider.enabled"> |
130 </span> | 140 </span> |
131 <button id="manage-default-search-engines" | 141 <button id="manage-default-search-engines" |
132 i18n-content="defaultSearchManageEngines"> | 142 i18n-content="defaultSearchManageEngines"> |
133 </button> | 143 </button> |
134 </div> | 144 </div> |
135 <div class="checkbox" guest-visibility="disabled"> | 145 <div class="checkbox" guest-visibility="disabled"> |
136 <label id="instant-label"> | 146 <span class="controlled-setting-with-label"> |
137 <!-- TODO(estade): metric? --> | 147 <!-- TODO(estade): metric? --> |
138 <input id="instant-enabled-control" type="checkbox" | 148 <input id="instant-enabled-control" type="checkbox" |
139 pref="instant.enabled"> | 149 pref="instant.enabled"> |
140 <!-- TODO(estade) There's a link in here which should not be inside | 150 <span> |
141 a <label>. --> | 151 <!-- TODO(estade) There's a link in here which should not be |
142 <span i18n-values=".innerHTML:instantPrefAndWarning"></span> | 152 inside a <label>. --> |
143 </label> | 153 <label for="instant-enabled-control" |
| 154 i18n-values=".innerHTML:instantPrefAndWarning"> |
| 155 </label> |
| 156 <span id="instant-enabled-indicator" |
| 157 class="controlled-setting-indicator" pref="instant.enabled"> |
| 158 </span> |
| 159 </span> |
| 160 </span> |
144 </div> | 161 </div> |
145 </div> | 162 </div> |
146 </section> | 163 </section> |
147 <section guest-visibility="hidden"> | 164 <section guest-visibility="hidden"> |
148 <h3 i18n-content="sectionTitleUsers"></h3> | 165 <h3 i18n-content="sectionTitleUsers"></h3> |
149 <if expr="pp_ifdef('chromeos')"> | 166 <if expr="pp_ifdef('chromeos')"> |
150 <include src="sync_section.html"> | 167 <include src="sync_section.html"> |
151 </if> | 168 </if> |
152 <div id="profiles-section" hidden> | 169 <div id="profiles-section" hidden> |
153 <list id="profiles-list" class="settings-list" hidden></list> | 170 <list id="profiles-list" class="settings-list" hidden></list> |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 i18n-content="safeBrowsingEnableProtection"> | 291 i18n-content="safeBrowsingEnableProtection"> |
275 </label> | 292 </label> |
276 <span class="controlled-setting-indicator" | 293 <span class="controlled-setting-indicator" |
277 pref="safebrowsing.enabled"> | 294 pref="safebrowsing.enabled"> |
278 </span> | 295 </span> |
279 </span> | 296 </span> |
280 </span> | 297 </span> |
281 </div> | 298 </div> |
282 <if expr="pp_ifdef('_google_chrome')"> | 299 <if expr="pp_ifdef('_google_chrome')"> |
283 <div class="checkbox"> | 300 <div class="checkbox"> |
284 <label id="spelling-label"> | 301 <span class="controlled-setting-with-label"> |
285 <input id="spelling-enabled-control" type="checkbox" | 302 <input id="spelling-enabled-control" type="checkbox" |
286 pref="spellcheck.use_spelling_service"> | 303 pref="spellcheck.use_spelling_service"> |
287 <span i18n-content="spellingPref"></span> | 304 <span> |
288 </label> | 305 <label for="spelling-enabled-control" i18n-content="spellingPref"> |
| 306 </label> |
| 307 <span id="spelling-enabled-indicator" |
| 308 class="controlled-setting-indicator" |
| 309 pref="spellcheck.use_spelling_service"> |
| 310 </span> |
| 311 </span> |
| 312 </span> |
289 </div> | 313 </div> |
290 <div id="metricsReportingSetting" class="checkbox"> | 314 <div id="metricsReportingSetting" class="checkbox"> |
291 <span class="controlled-setting-with-label"> | 315 <span class="controlled-setting-with-label"> |
292 <if expr="pp_ifdef('chromeos')"> | 316 <if expr="pp_ifdef('chromeos')"> |
293 <input id="metricsReportingEnabled" | 317 <input id="metricsReportingEnabled" |
294 pref="cros.metrics.reportingEnabled" type="checkbox"> | 318 pref="cros.metrics.reportingEnabled" type="checkbox"> |
295 </if> | 319 </if> |
296 <if expr="not pp_ifdef('chromeos')"> | 320 <if expr="not pp_ifdef('chromeos')"> |
297 <input id="metricsReportingEnabled" | 321 <input id="metricsReportingEnabled" |
298 pref="user_experience_metrics.reporting_enabled" type="checkbox"> | 322 pref="user_experience_metrics.reporting_enabled" type="checkbox"> |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 </section> | 468 </section> |
445 </if> | 469 </if> |
446 <section> | 470 <section> |
447 <h3 i18n-content="advancedSectionTitleLanguages"></h3> | 471 <h3 i18n-content="advancedSectionTitleLanguages"></h3> |
448 <span class="settings-row" i18n-content="languageSectionLabel"></span> | 472 <span class="settings-row" i18n-content="languageSectionLabel"></span> |
449 <div class="settings-row"> | 473 <div class="settings-row"> |
450 <button id="language-button" | 474 <button id="language-button" |
451 i18n-content="languageAndSpellCheckSettingsButton"></button> | 475 i18n-content="languageAndSpellCheckSettingsButton"></button> |
452 </div> | 476 </div> |
453 <div class="checkbox"> | 477 <div class="checkbox"> |
454 <label> | 478 <span class="controlled-setting-with-label"> |
455 <input id="enableTranslate" pref="translate.enabled" | 479 <input id="enableTranslate" pref="translate.enabled" |
456 metric="Options_Translate" type="checkbox"> | 480 metric="Options_Translate" type="checkbox"> |
457 <span i18n-content="translateEnableTranslate"></span> | 481 <span> |
458 </label> | 482 <label for="enableTranslate"i18n-content="translateEnableTranslate"> |
| 483 </label> |
| 484 <span class="controlled-setting-indicator" pref="translate.enabled"> |
| 485 </span> |
| 486 </span> |
| 487 </span> |
459 </div> | 488 </div> |
460 </section> | 489 </section> |
461 <section> | 490 <section> |
462 <h3 i18n-content="downloadLocationGroupName"></h3> | 491 <h3 i18n-content="downloadLocationGroupName"></h3> |
463 <div> | 492 <div> |
464 <div class="settings-row"> | 493 <div class="settings-row"> |
465 <label> | 494 <label> |
466 <span id="download-location-label" | 495 <span id="download-location-label" |
467 i18n-content="downloadLocationBrowseTitle"> | 496 i18n-content="downloadLocationBrowseTitle"> |
468 </span> | 497 </span> |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
603 i18n-content="factoryResetRestart"> | 632 i18n-content="factoryResetRestart"> |
604 </button> | 633 </button> |
605 </div> | 634 </div> |
606 </section> | 635 </section> |
607 </if> | 636 </if> |
608 </if> | 637 </if> |
609 <if expr="not is_macosx and not pp_ifdef('chromeos')"> | 638 <if expr="not is_macosx and not pp_ifdef('chromeos')"> |
610 <section id="background-section"> | 639 <section id="background-section"> |
611 <h3 i18n-content="advancedSectionTitleBackground"></h3> | 640 <h3 i18n-content="advancedSectionTitleBackground"></h3> |
612 <div class="checkbox"> | 641 <div class="checkbox"> |
613 <label> | 642 <span class="controlled-setting-with-label"> |
614 <input id="backgroundModeCheckbox" pref="background_mode.enabled" | 643 <input id="backgroundModeCheckbox" pref="background_mode.enabled" |
615 type="checkbox"> | 644 type="checkbox"> |
616 <span i18n-content="backgroundModeCheckbox"></span> | 645 <span> |
617 </label> | 646 <label for="backgroundModeCheckbox" |
| 647 i18n-content="backgroundModeCheckbox"> |
| 648 </label> |
| 649 <span class="controlled-setting-indicator" |
| 650 pref="background_mode.enabled"> |
| 651 </span> |
| 652 </span> |
| 653 </span> |
618 </div> | 654 </div> |
619 </section> | 655 </section> |
620 </if> | 656 </if> |
621 </div> <!-- advanced-settings-container --> | 657 </div> <!-- advanced-settings-container --> |
622 </div> <!-- advanced-settings --> | 658 </div> <!-- advanced-settings --> |
623 <footer> | 659 <footer> |
624 <button id="advanced-settings-expander" class="link-button" | 660 <button id="advanced-settings-expander" class="link-button" |
625 i18n-content="showAdvancedSettings"> | 661 i18n-content="showAdvancedSettings"> |
626 </button> | 662 </button> |
627 </footer> | 663 </footer> |
628 </div> | 664 </div> |
OLD | NEW |