| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> | 3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 5 <link rel="import" href="/about_page/about_page.html"> | 5 <link rel="import" href="/about_page/about_page.html"> |
| 6 <link rel="import" href="/advanced_page/advanced_page.html"> | 6 <link rel="import" href="/advanced_page/advanced_page.html"> |
| 7 <link rel="import" href="/basic_page/basic_page.html"> | 7 <link rel="import" href="/basic_page/basic_page.html"> |
| 8 <link rel="import" href="/settings_main/settings_main_rendered.html"> | 8 <link rel="import" href="/settings_main/settings_main_rendered.html"> |
| 9 <link rel="import" href="/settings_page/main_page_behavior.html"> | 9 <link rel="import" href="/settings_page/main_page_behavior.html"> |
| 10 <link rel="import" href="/settings_vars_css.html"> | 10 <link rel="import" href="/settings_vars_css.html"> |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 </template> | 54 </template> |
| 55 <template is="dom-if" if="[[showPages_.advanced]]"> | 55 <template is="dom-if" if="[[showPages_.advanced]]"> |
| 56 <settings-advanced-page prefs="{{prefs}}" | 56 <settings-advanced-page prefs="{{prefs}}" |
| 57 current-route="{{currentRoute}}"> | 57 current-route="{{currentRoute}}"> |
| 58 </settings-advanced-page> | 58 </settings-advanced-page> |
| 59 </template> | 59 </template> |
| 60 <template is="dom-if" if="[[showPages_.about]]"> | 60 <template is="dom-if" if="[[showPages_.about]]"> |
| 61 <settings-about-page current-route="{{currentRoute}}"> | 61 <settings-about-page current-route="{{currentRoute}}"> |
| 62 </settings-about-page> | 62 </settings-about-page> |
| 63 </template> | 63 </template> |
| 64 <div id="overscroll"></div> |
| 64 </template> | 65 </template> |
| 65 <script src="settings_main.js"></script> | 66 <script src="settings_main.js"></script> |
| 66 <script src="/search_settings.js"></script> | 67 <script src="/search_settings.js"></script> |
| 67 </dom-module> | 68 </dom-module> |
| OLD | NEW |