| 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"> | |
| 3 <link rel="import" href="../appearance_page/appearance_page.html"> | 2 <link rel="import" href="../appearance_page/appearance_page.html"> |
| 4 <link rel="import" href="../controls/settings_idle_render.html"> | 3 <link rel="import" href="../controls/settings_idle_render.html"> |
| 5 <link rel="import" href="../downloads_page/downloads_page.html"> | 4 <link rel="import" href="../lazy_load.html"> |
| 6 <link rel="import" href="../languages_page/languages_page.html"> | |
| 7 <link rel="import" href="../on_startup_page/on_startup_page.html"> | 5 <link rel="import" href="../on_startup_page/on_startup_page.html"> |
| 8 <link rel="import" href="../passwords_and_forms_page/passwords_and_forms_page.ht
ml"> | |
| 9 <link rel="import" href="../people_page/people_page.html"> | 6 <link rel="import" href="../people_page/people_page.html"> |
| 10 <link rel="import" href="../printing_page/printing_page.html"> | |
| 11 <link rel="import" href="../privacy_page/privacy_page.html"> | |
| 12 <link rel="import" href="../reset_page/reset_page.html"> | |
| 13 <link rel="import" href="../reset_page/reset_profile_banner.html"> | 7 <link rel="import" href="../reset_page/reset_profile_banner.html"> |
| 14 <link rel="import" href="../search_page/search_page.html"> | 8 <link rel="import" href="../search_page/search_page.html"> |
| 15 <link rel="import" href="../settings_page/main_page_behavior.html"> | 9 <link rel="import" href="../settings_page/main_page_behavior.html"> |
| 16 <link rel="import" href="../settings_page/settings_page_visibility.html"> | 10 <link rel="import" href="../settings_page/settings_page_visibility.html"> |
| 17 <link rel="import" href="../settings_page/settings_section.html"> | 11 <link rel="import" href="../settings_page/settings_section.html"> |
| 18 <link rel="import" href="../settings_page_css.html"> | 12 <link rel="import" href="../settings_page_css.html"> |
| 19 <link rel="import" href="../settings_vars_css.html"> | 13 <link rel="import" href="../settings_vars_css.html"> |
| 20 | 14 |
| 21 <if expr="chromeos"> | 15 <if expr="chromeos"> |
| 22 <link rel="import" href="../android_apps_page/android_apps_page.html"> | 16 <link rel="import" href="../android_apps_page/android_apps_page.html"> |
| 23 <link rel="import" href="../bluetooth_page/bluetooth_page.html"> | 17 <link rel="import" href="../bluetooth_page/bluetooth_page.html"> |
| 24 <link rel="import" href="../date_time_page/date_time_page.html"> | |
| 25 <link rel="import" href="../device_page/device_page.html"> | 18 <link rel="import" href="../device_page/device_page.html"> |
| 26 <link rel="import" href="../internet_page/internet_page.html"> | 19 <link rel="import" href="../internet_page/internet_page.html"> |
| 27 </if> | 20 </if> |
| 28 | 21 |
| 29 <if expr="not chromeos"> | 22 <if expr="not chromeos"> |
| 30 <link rel="import" href="../default_browser_page/default_browser_page.html"> | 23 <link rel="import" href="../default_browser_page/default_browser_page.html"> |
| 31 <link rel="import" href="../system_page/system_page.html"> | |
| 32 </if> | 24 </if> |
| 33 | 25 |
| 34 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page | 26 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page |
| 35 includes both the basic and advanced settings. --> | 27 includes both the basic and advanced settings. --> |
| 36 <dom-module id="settings-basic-page"> | 28 <dom-module id="settings-basic-page"> |
| 37 <template> | 29 <template> |
| 38 <style include="settings-page-styles"> | 30 <style include="settings-page-styles"> |
| 39 #advancedToggle { | 31 #advancedToggle { |
| 40 --paper-button: { | 32 --paper-button: { |
| 41 text-transform: none; | 33 text-transform: none; |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 section="reset"> | 260 section="reset"> |
| 269 <settings-reset-page></settings-reset-page> | 261 <settings-reset-page></settings-reset-page> |
| 270 </settings-section> | 262 </settings-section> |
| 271 </template> | 263 </template> |
| 272 </div> | 264 </div> |
| 273 </template> | 265 </template> |
| 274 </template> | 266 </template> |
| 275 </template> | 267 </template> |
| 276 <script src="basic_page.js"></script> | 268 <script src="basic_page.js"></script> |
| 277 </dom-module> | 269 </dom-module> |
| OLD | NEW |