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