Chromium Code Reviews| 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/polymer/v1_0/iron-icon/iron-icon.htm l"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 4 <link rel="import" href="/about_page/about_page.html"> | 4 <link rel="import" href="/about_page/about_page.html"> |
| 5 <link rel="import" href="/advanced_page/advanced_page.html"> | 5 <link rel="import" href="/advanced_page/advanced_page.html"> |
| 6 <link rel="import" href="/basic_page/basic_page.html"> | 6 <link rel="import" href="/basic_page/basic_page.html"> |
| 7 <link rel="import" href="/settings_page/main_page_behavior.html"> | 7 <link rel="import" href="/settings_page/main_page_behavior.html"> |
| 8 | 8 |
| 9 <dom-module id="settings-main"> | 9 <dom-module id="settings-main"> |
| 10 <template> | 10 <template> |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 </template> | 49 </template> |
| 50 <template is="dom-if" if="[[showAdvancedPage_]]"> | 50 <template is="dom-if" if="[[showAdvancedPage_]]"> |
| 51 <settings-advanced-page prefs="{{prefs}}" | 51 <settings-advanced-page prefs="{{prefs}}" |
| 52 current-route="{{currentRoute}}"> | 52 current-route="{{currentRoute}}"> |
| 53 </settings-advanced-page> | 53 </settings-advanced-page> |
| 54 </template> | 54 </template> |
| 55 <template is="dom-if" if="[[showAboutPage_]]"> | 55 <template is="dom-if" if="[[showAboutPage_]]"> |
| 56 <settings-about-page current-route="{{currentRoute}}"> | 56 <settings-about-page current-route="{{currentRoute}}"> |
| 57 </settings-about-page> | 57 </settings-about-page> |
| 58 </template> | 58 </template> |
| 59 <div id='endOfPageSpace'></div> | |
|
Dan Beam
2016/06/23 02:48:21
' => "
Dan Beam
2016/06/23 02:48:21
nit: id="overscroll"
dschuyler
2016/06/23 18:33:10
Done.
dschuyler
2016/06/23 18:33:10
Done.
| |
| 59 </template> | 60 </template> |
| 60 <script src="settings_main.js"></script> | 61 <script src="settings_main.js"></script> |
| 61 </dom-module> | 62 </dom-module> |
| OLD | NEW |