| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="/a11y_page/a11y_page.html"> | 2 <link rel="import" href="/a11y_page/a11y_page.html"> |
| 3 <link rel="import" href="/downloads_page/downloads_page.html"> | 3 <link rel="import" href="/downloads_page/downloads_page.html"> |
| 4 <link rel="import" href="/languages_page/languages_page.html"> | 4 <link rel="import" href="/languages_page/languages_page.html"> |
| 5 <link rel="import" href="/passwords_and_forms_page/passwords_and_forms_page.html
"> | 5 <link rel="import" href="/passwords_and_forms_page/passwords_and_forms_page.html
"> |
| 6 <link rel="import" href="/privacy_page/privacy_page.html"> | 6 <link rel="import" href="/privacy_page/privacy_page.html"> |
| 7 <link rel="import" href="/reset_page/reset_page.html"> | 7 <link rel="import" href="/reset_page/reset_page.html"> |
| 8 <link rel="import" href="/settings_page/main_page_behavior.html"> | 8 <link rel="import" href="/settings_page/main_page_behavior.html"> |
| 9 <link rel="import" href="/settings_page/settings_page_visibility.html"> | 9 <link rel="import" href="/settings_page/settings_page_visibility.html"> |
| 10 <link rel="import" href="/settings_page/settings_router.html"> | 10 <link rel="import" href="/settings_page/settings_router.html"> |
| 11 <link rel="import" href="/settings_page/settings_section.html"> | 11 <link rel="import" href="/settings_page/settings_section.html"> |
| 12 <link rel="import" href="/settings_page_css.html"> | 12 <link rel="import" href="/settings_page_css.html"> |
| 13 <link rel="import" href="/site_settings/constants.html"> | 13 <link rel="import" href="/site_settings/constants.html"> |
| 14 <link rel="import" href="/site_settings/site_settings_category.html"> | 14 <link rel="import" href="/site_settings/site_settings_category.html"> |
| 15 | 15 |
| 16 <if expr="chromeos"> | 16 <if expr="chromeos"> |
| 17 <link rel="import" href="/bluetooth_page/bluetooth_page.html"> | 17 <link rel="import" href="/bluetooth_page/bluetooth_page.html"> |
| 18 <link rel="import" href="/date_time_page/date_time_page.html"> | 18 <link rel="import" href="/date_time_page/date_time_page.html"> |
| 19 </if> | 19 </if> |
| 20 | 20 |
| 21 <if expr="not chromeos"> | 21 <if expr="not chromeos"> |
| 22 <link rel="import" href="/system_page/system_page.html"> | 22 <link rel="import" href="/system_page/system_page.html"> |
| 23 </if> | 23 </if> |
| 24 | 24 |
| 25 <dom-module id="settings-advanced-page"> | 25 <dom-module id="settings-advanced-page"> |
| 26 <template> | 26 <template> |
| 27 <style include="settings-page-styles"></style> | 27 <style include="settings-page-styles"></style> |
| 28 <div data-page="advanced"> |
| 28 <if expr="chromeos"> | 29 <if expr="chromeos"> |
| 29 <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]" restamp> | 30 <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]" restamp> |
| 30 <settings-section page-title="$i18n{dateTimePageTitle}" | 31 <settings-section page-title="$i18n{dateTimePageTitle}" |
| 31 current-route="[[currentRoute]]" section="dateTime"> | 32 current-route="[[currentRoute]]" section="dateTime"> |
| 32 <settings-date-time-page prefs="{{prefs}}"> | 33 <settings-date-time-page prefs="{{prefs}}"> |
| 33 </settings-date-time-page> | 34 </settings-date-time-page> |
| 34 </settings-section> | 35 </settings-section> |
| 35 </template> | 36 </template> |
| 36 </if> | 37 </if> |
| 37 <template is="dom-if" if="[[showPage(pageVisibility.privacy)]]" restamp> | 38 <template is="dom-if" if="[[showPage(pageVisibility.privacy)]]" restamp> |
| 38 <settings-section page-title="$i18n{privacyPageTitle}" | 39 <settings-section page-title="$i18n{privacyPageTitle}" |
| 39 current-route="[[currentRoute]]" section="privacy"> | 40 current-route="[[currentRoute]]" section="privacy"> |
| 40 <settings-privacy-page prefs="{{prefs}}" | 41 <settings-privacy-page prefs="{{prefs}}" |
| 41 current-route="{{currentRoute}}"> | 42 current-route="{{currentRoute}}"> |
| 42 </settings-privacy-page> | 43 </settings-privacy-page> |
| 43 </settings-section> | 44 </settings-section> |
| 44 </template> | 45 </template> |
| 45 <if expr="chromeos"> | 46 <if expr="chromeos"> |
| 46 <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]" restamp> | 47 <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]" restamp> |
| 47 <settings-section page-title="$i18n{bluetoothPageTitle}" | 48 <settings-section page-title="$i18n{bluetoothPageTitle}" |
| 48 current-route="[[currentRoute]]" section="bluetooth"> | 49 current-route="[[currentRoute]]" section="bluetooth"> |
| 49 <settings-bluetooth-page current-route="{{currentRoute}}"> | 50 <settings-bluetooth-page current-route="{{currentRoute}}"> |
| 50 </settings-bluetooth-page> | 51 </settings-bluetooth-page> |
| 51 </settings-section> | 52 </settings-section> |
| 52 </template> | 53 </template> |
| 53 </if> | 54 </if> |
| 54 <template is="dom-if" if="[[showPage(pageVisibility.passwordsAndForms)]]" | 55 <template is="dom-if" if="[[showPage(pageVisibility.passwordsAndForms)]]" |
| 55 restamp> | 56 restamp> |
| 56 <settings-section | 57 <settings-section |
| 57 page-title="$i18n{passwordsAndAutofillPageTitle}" | 58 page-title="$i18n{passwordsAndAutofillPageTitle}" |
| 58 current-route="[[currentRoute]]" section="passwordsAndForms"> | 59 current-route="[[currentRoute]]" section="passwordsAndForms"> |
| 59 <settings-passwords-and-forms-page prefs="{{prefs}}" | 60 <settings-passwords-and-forms-page prefs="{{prefs}}" |
| 60 current-route="{{currentRoute}}"> | 61 current-route="{{currentRoute}}"> |
| 61 </settings-passwords-and-forms-page> | 62 </settings-passwords-and-forms-page> |
| 62 </settings-section> | 63 </settings-section> |
| 63 </template> | 64 </template> |
| 64 <template is="dom-if" if="[[showPage(pageVisibility.languages)]]" restamp> | 65 <template is="dom-if" if="[[showPage(pageVisibility.languages)]]" restamp> |
| 65 <settings-section page-title="$i18n{languagesPageTitle}" | 66 <settings-section page-title="$i18n{languagesPageTitle}" |
| 66 current-route="[[currentRoute]]" section="languages"> | 67 current-route="[[currentRoute]]" section="languages"> |
| 67 <settings-languages-page prefs="{{prefs}}" | 68 <settings-languages-page prefs="{{prefs}}" |
| 68 current-route="{{currentRoute}}"> | 69 current-route="{{currentRoute}}"> |
| 69 </settings-languages-page> | 70 </settings-languages-page> |
| 70 </settings-section> | 71 </settings-section> |
| 71 </template> | 72 </template> |
| 72 <template is="dom-if" if="[[showPage(pageVisibility.downloads)]]" restamp> | 73 <template is="dom-if" if="[[showPage(pageVisibility.downloads)]]" restamp> |
| 73 <settings-section page-title="$i18n{downloadsPageTitle}" | 74 <settings-section page-title="$i18n{downloadsPageTitle}" |
| 74 current-route="[[currentRoute]]" section="downloads"> | 75 current-route="[[currentRoute]]" section="downloads"> |
| 75 <settings-downloads-page prefs="{{prefs}}"> | 76 <settings-downloads-page prefs="{{prefs}}"> |
| 76 </settings-downloads-page> | 77 </settings-downloads-page> |
| 77 </settings-section> | 78 </settings-section> |
| 78 </template> | 79 </template> |
| 79 | 80 |
| 80 <!-- TODO(dschuyler): Add Google Cloud Print section here. --> | 81 <!-- TODO(dschuyler): Add Google Cloud Print section here. --> |
| 81 | 82 |
| 82 <template is="dom-if" if="[[showPage(pageVisibility.a11y)]]" restamp> | 83 <template is="dom-if" if="[[showPage(pageVisibility.a11y)]]" restamp> |
| 83 <settings-section page-title="$i18n{a11yPageTitle}" | 84 <settings-section page-title="$i18n{a11yPageTitle}" |
| 84 current-route="[[currentRoute]]" section="a11y"> | 85 current-route="[[currentRoute]]" section="a11y"> |
| 85 <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page> | 86 <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page> |
| 86 </settings-section> | 87 </settings-section> |
| 87 </template> | 88 </template> |
| 88 <if expr="not chromeos"> | 89 <if expr="not chromeos"> |
| 89 <template is="dom-if" if="[[showPage(pageVisibility.system)]]" restamp> | 90 <template is="dom-if" if="[[showPage(pageVisibility.system)]]" restamp> |
| 90 <settings-section page-title="$i18n{systemPageTitle}" | 91 <settings-section page-title="$i18n{systemPageTitle}" |
| 91 current-route="[[currentRoute]]" section="system"> | 92 current-route="[[currentRoute]]" section="system"> |
| 92 <settings-system-page prefs="{{prefs}}"></settings-system-page> | 93 <settings-system-page prefs="{{prefs}}"></settings-system-page> |
| 93 </settings-section> | 94 </settings-section> |
| 94 </template> | 95 </template> |
| 95 </if> | 96 </if> |
| 96 <template is="dom-if" if="[[showPage(pageVisibility.reset)]]" restamp> | 97 <template is="dom-if" if="[[showPage(pageVisibility.reset)]]" restamp> |
| 97 <settings-section page-title="$i18n{resetPageTitle}" | 98 <settings-section page-title="$i18n{resetPageTitle}" |
| 98 current-route="[[currentRoute]]" section="reset"> | 99 current-route="[[currentRoute]]" section="reset"> |
| 99 <settings-reset-page></settings-reset-page> | 100 <settings-reset-page></settings-reset-page> |
| 100 </settings-section> | 101 </settings-section> |
| 101 </template> | 102 </template> |
| 103 </div> |
| 102 </template> | 104 </template> |
| 103 <script src="/advanced_page/advanced_page.js"></script> | 105 <script src="/advanced_page/advanced_page.js"></script> |
| 104 </dom-module> | 106 </dom-module> |
| OLD | NEW |