| 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 | 12 |
| 12 <if expr="chromeos"> | 13 <if expr="chromeos"> |
| 13 <link rel="import" href="/device_page/device_page.html"> | 14 <link rel="import" href="/device_page/device_page.html"> |
| 14 <link rel="import" href="/internet_page/internet_page.html"> | 15 <link rel="import" href="/internet_page/internet_page.html"> |
| 15 </if> | 16 </if> |
| 16 | 17 |
| 17 <if expr="not chromeos"> | 18 <if expr="not chromeos"> |
| 18 <link rel="import" href="/default_browser_page/default_browser_page.html"> | 19 <link rel="import" href="/default_browser_page/default_browser_page.html"> |
| 19 </if> | 20 </if> |
| 20 | 21 |
| 21 <dom-module id="settings-basic-page"> | 22 <dom-module id="settings-basic-page"> |
| 22 <link rel="import" type="css" href="/settings_page.css"> | |
| 23 <template> | 23 <template> |
| 24 <style include="main-page-styles"></style> | 24 <style include="settings-page-styles"></style> |
| 25 <template is="dom-if" if="[[showResetProfileBanner_]]"> | 25 <template is="dom-if" if="[[showResetProfileBanner_]]"> |
| 26 <settings-reset-profile-banner on-reset-done="onResetDone_"> | 26 <settings-reset-profile-banner on-reset-done="onResetDone_"> |
| 27 </settings-reset-profile-banner> | 27 </settings-reset-profile-banner> |
| 28 </template> | 28 </template> |
| 29 <if expr="chromeos"> | 29 <if expr="chromeos"> |
| 30 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> | 30 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> |
| 31 <settings-section page-title="$i18n{internetPageTitle}" | 31 <settings-section page-title="$i18n{internetPageTitle}" |
| 32 current-route="[[currentRoute]]" section="internet"> | 32 current-route="[[currentRoute]]" section="internet"> |
| 33 <settings-internet-page current-route="{{currentRoute}}"> | 33 <settings-internet-page current-route="{{currentRoute}}"> |
| 34 </settings-internet-page> | 34 </settings-internet-page> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 <settings-section page-title="$i18n{onStartup}" | 83 <settings-section page-title="$i18n{onStartup}" |
| 84 current-route="[[currentRoute]]" section="onStartup"> | 84 current-route="[[currentRoute]]" section="onStartup"> |
| 85 <settings-on-startup-page prefs="{{prefs}}" | 85 <settings-on-startup-page prefs="{{prefs}}" |
| 86 current-route="{{currentRoute}}"> | 86 current-route="{{currentRoute}}"> |
| 87 </settings-on-startup-page> | 87 </settings-on-startup-page> |
| 88 </settings-section> | 88 </settings-section> |
| 89 </template> | 89 </template> |
| 90 </template> | 90 </template> |
| 91 <script src="basic_page.js"></script> | 91 <script src="basic_page.js"></script> |
| 92 </dom-module> | 92 </dom-module> |
| OLD | NEW |