| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 |
| 1 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | |
| 4 <link rel="import" href="chrome://resources/html/promise_resolver.html"> | 5 <link rel="import" href="chrome://resources/html/promise_resolver.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iro
n-a11y-announcer.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iro
n-a11y-announcer.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 8 <link rel="import" href="../about_page/about_page.html"> | 9 <link rel="import" href="../about_page/about_page.html"> |
| 9 <link rel="import" href="../basic_page/basic_page.html"> | 10 <link rel="import" href="../basic_page/basic_page.html"> |
| 10 <link rel="import" href="../i18n_setup.html"> | 11 <link rel="import" href="../i18n_setup.html"> |
| 11 <link rel="import" href="../prefs/prefs.html"> | 12 <link rel="import" href="../prefs/prefs.html"> |
| 12 <link rel="import" href="../route.html"> | 13 <link rel="import" href="../route.html"> |
| 13 <link rel="import" href="../settings_shared_css.html"> | 14 <link rel="import" href="../settings_shared_css.html"> |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 </template> | 53 </template> |
| 53 <template is="dom-if" if="[[showPages_.about]]"> | 54 <template is="dom-if" if="[[showPages_.about]]"> |
| 54 <settings-about-page in-search-mode="[[inSearchMode_]]"> | 55 <settings-about-page in-search-mode="[[inSearchMode_]]"> |
| 55 </settings-about-page> | 56 </settings-about-page> |
| 56 </template> | 57 </template> |
| 57 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 58 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
| 58 </template> | 59 </template> |
| 59 <script src="settings_main.js"></script> | 60 <script src="settings_main.js"></script> |
| 60 <script src="../search_settings.js"></script> | 61 <script src="../search_settings.js"></script> |
| 61 </dom-module> | 62 </dom-module> |
| OLD | NEW |