| 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="/appearance_page/appearance_page.html"> | 2 <link rel="import" href="/appearance_page/appearance_page.html"> |
| 3 <link rel="import" href="/search_page/search_page.html"> | 3 <link rel="import" href="/search_page/search_page.html"> |
| 4 <link rel="import" href="/settings_page/main_page_behavior.html"> | 4 <link rel="import" href="/settings_page/main_page_behavior.html"> |
| 5 <link rel="import" href="/settings_page/settings_page_visibility.html"> | 5 <link rel="import" href="/settings_page/settings_page_visibility.html"> |
| 6 <link rel="import" href="/settings_page/settings_router.html"> | |
| 7 <link rel="import" href="/settings_page/settings_section.html"> | 6 <link rel="import" href="/settings_page/settings_section.html"> |
| 8 <link rel="import" href="/on_startup_page/on_startup_page.html"> | 7 <link rel="import" href="/on_startup_page/on_startup_page.html"> |
| 9 <link rel="import" href="/people_page/people_page.html"> | 8 <link rel="import" href="/people_page/people_page.html"> |
| 10 <link rel="import" href="/reset_page/reset_profile_banner.html"> | 9 <link rel="import" href="/reset_page/reset_profile_banner.html"> |
| 11 <link rel="import" href="/settings_page_css.html"> | 10 <link rel="import" href="/settings_page_css.html"> |
| 12 | 11 |
| 13 <if expr="chromeos"> | 12 <if expr="chromeos"> |
| 14 <link rel="import" href="/device_page/device_page.html"> | 13 <link rel="import" href="/device_page/device_page.html"> |
| 15 <link rel="import" href="/internet_page/internet_page.html"> | 14 <link rel="import" href="/internet_page/internet_page.html"> |
| 16 </if> | 15 </if> |
| 17 | 16 |
| 18 <if expr="not chromeos"> | 17 <if expr="not chromeos"> |
| 19 <link rel="import" href="/default_browser_page/default_browser_page.html"> | 18 <link rel="import" href="/default_browser_page/default_browser_page.html"> |
| 20 </if> | 19 </if> |
| 21 | 20 |
| 22 <dom-module id="settings-basic-page"> | 21 <dom-module id="settings-basic-page"> |
| 23 <template> | 22 <template> |
| 24 <style include="settings-page-styles"></style> | 23 <style include="settings-page-styles"></style> |
| 25 <div> | 24 <div> |
| 26 <template is="dom-if" if="[[showResetProfileBanner_]]"> | 25 <template is="dom-if" if="[[showResetProfileBanner_]]"> |
| 27 <settings-reset-profile-banner on-reset-done="onResetDone_"> | 26 <settings-reset-profile-banner on-reset-done="onResetDone_"> |
| 28 </settings-reset-profile-banner> | 27 </settings-reset-profile-banner> |
| 29 </template> | 28 </template> |
| 30 <if expr="chromeos"> | 29 <if expr="chromeos"> |
| 31 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> | 30 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> |
| 32 <settings-section page-title="$i18n{internetPageTitle}" | 31 <settings-section page-title="$i18n{internetPageTitle}" |
| 33 current-route="[[currentRoute]]" section="internet"> | 32 section="internet"> |
| 34 <settings-internet-page current-route="{{currentRoute}}"> | 33 <settings-internet-page> |
| 35 </settings-internet-page> | 34 </settings-internet-page> |
| 36 </settings-section> | 35 </settings-section> |
| 37 </template> | 36 </template> |
| 38 </if> | 37 </if> |
| 39 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp> | 38 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp> |
| 40 <settings-section page-title="$i18n{peoplePageTitle}" | 39 <settings-section page-title="$i18n{peoplePageTitle}" section="people"> |
| 41 current-route="[[currentRoute]]" section="people"> | 40 <settings-people-page prefs="{{prefs}}"></settings-people-page> |
| 42 <settings-people-page prefs="{{prefs}}" | |
| 43 current-route="{{currentRoute}}"> | |
| 44 </settings-people-page> | |
| 45 </settings-section> | 41 </settings-section> |
| 46 </template> | 42 </template> |
| 47 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" | 43 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" |
| 48 restamp> | 44 restamp> |
| 49 <settings-section page-title="$i18n{appearancePageTitle}" | 45 <settings-section page-title="$i18n{appearancePageTitle}" |
| 50 current-route="[[currentRoute]]" section="appearance"> | 46 section="appearance"> |
| 51 <settings-appearance-page prefs="{{prefs}}" | 47 <settings-appearance-page prefs="{{prefs}}" |
| 52 current-route="{{currentRoute}}" | |
| 53 page-visibility="[[pageVisibility.appearance]]"> | 48 page-visibility="[[pageVisibility.appearance]]"> |
| 54 </settings-appearance-page> | 49 </settings-appearance-page> |
| 55 </settings-section> | 50 </settings-section> |
| 56 </template> | 51 </template> |
| 57 <if expr="chromeos"> | 52 <if expr="chromeos"> |
| 58 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp> | 53 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp> |
| 59 <settings-section page-title="$i18n{devicePageTitle}" | 54 <settings-section page-title="$i18n{devicePageTitle}" section="device"> |
| 60 current-route="[[currentRoute]]" section="device"> | 55 <settings-device-page prefs="{{prefs}}"></settings-device-page> |
| 61 <settings-device-page prefs="{{prefs}}" | |
| 62 current-route="{{currentRoute}}"> | |
| 63 </settings-device-page> | |
| 64 </settings-section> | 56 </settings-section> |
| 65 </template> | 57 </template> |
| 66 </if> | 58 </if> |
| 67 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> | 59 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> |
| 68 <settings-section page-title="$i18n{searchPageTitle}" | 60 <settings-section page-title="$i18n{searchPageTitle}" section="search"> |
| 69 current-route="[[currentRoute]]" section="search"> | 61 <settings-search-page></settings-search-page> |
| 70 <settings-search-page current-route="{{currentRoute}}"> | |
| 71 </settings-search-page> | |
| 72 </settings-section> | 62 </settings-section> |
| 73 </template> | 63 </template> |
| 74 <if expr="not chromeos"> | 64 <if expr="not chromeos"> |
| 75 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]" | 65 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]" |
| 76 restamp> | 66 restamp> |
| 77 <settings-section page-title="$i18n{defaultBrowser}" | 67 <settings-section page-title="$i18n{defaultBrowser}" |
| 78 current-route="[[currentRoute]]" section="defaultBrowser"> | 68 section="defaultBrowser"> |
| 79 <settings-default-browser-page> | 69 <settings-default-browser-page></settings-default-browser-page> |
| 80 </settings-default-browser-page> | |
| 81 </settings-section> | 70 </settings-section> |
| 82 </template> | 71 </template> |
| 83 </if> | 72 </if> |
| 84 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp> | 73 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp> |
| 85 <settings-section page-title="$i18n{onStartup}" | 74 <settings-section page-title="$i18n{onStartup}" section="onStartup"> |
| 86 current-route="[[currentRoute]]" section="onStartup"> | 75 <settings-on-startup-page prefs="{{prefs}}"> |
| 87 <settings-on-startup-page prefs="{{prefs}}" | |
| 88 current-route="{{currentRoute}}"> | |
| 89 </settings-on-startup-page> | 76 </settings-on-startup-page> |
| 90 </settings-section> | 77 </settings-section> |
| 91 </template> | 78 </template> |
| 92 </div> | 79 </div> |
| 93 </template> | 80 </template> |
| 94 <script src="basic_page.js"></script> | 81 <script src="basic_page.js"></script> |
| 95 </dom-module> | 82 </dom-module> |
| OLD | NEW |