| 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_root_css.html"> | 10 <link rel="import" href="/settings_root_css.html"> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #toggleSpacer { | 32 #toggleSpacer { |
| 33 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 33 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
| 34 } | 34 } |
| 35 | 35 |
| 36 iron-icon { | 36 iron-icon { |
| 37 -webkit-margin-start: 16px; | 37 -webkit-margin-start: 16px; |
| 38 } | 38 } |
| 39 </style> | 39 </style> |
| 40 <content select="paper-icon-button"></content> | 40 <content select="paper-icon-button"></content> |
| 41 <template is="dom-if" if="[[showBasicPage_]]"> | 41 <template is="dom-if" if="[[showBasicPage_]]"> |
| 42 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> | 42 <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}" |
| 43 on-subpage-expand="subpageExpanded_" |
| 44 on-subpage-collapsing="subpageCollapsing_"> |
| 43 </settings-basic-page> | 45 </settings-basic-page> |
| 44 </template> | 46 </template> |
| 45 <template is="dom-if" if="[[showAdvancedToggle_]]"> | 47 <template is="dom-if" if="[[showAdvancedToggle_]]"> |
| 46 <div id="toggleSpacer"></div> | 48 <div id="toggleSpacer"></div> |
| 47 <div id="toggleContainer"> | 49 <div id="toggleContainer"> |
| 48 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> | 50 <div id="advancedToggle" on-tap="toggleAdvancedPage_"> |
| 49 <span>$i18n{advancedPageTitle}</span> | 51 <span>$i18n{advancedPageTitle}</span> |
| 50 <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon> | 52 <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon> |
| 51 </div> | 53 </div> |
| 52 </div> | 54 </div> |
| 53 </template> | 55 </template> |
| 54 <template is="dom-if" if="[[showAdvancedPage_]]"> | 56 <template is="dom-if" if="[[showAdvancedPage_]]"> |
| 55 <settings-advanced-page prefs="{{prefs}}" | 57 <settings-advanced-page prefs="{{prefs}}" |
| 56 current-route="{{currentRoute}}"> | 58 current-route="{{currentRoute}}" |
| 59 on-subpage-expand="subpageExpanded_" |
| 60 on-subpage-collapsing="subpageCollapsing_"> |
| 57 </settings-advanced-page> | 61 </settings-advanced-page> |
| 58 </template> | 62 </template> |
| 59 <template is="dom-if" if="[[showAboutPage_]]"> | 63 <template is="dom-if" if="[[showAboutPage_]]"> |
| 60 <settings-about-page current-route="{{currentRoute}}"> | 64 <settings-about-page current-route="{{currentRoute}}"> |
| 61 </settings-about-page> | 65 </settings-about-page> |
| 62 </template> | 66 </template> |
| 63 </template> | 67 </template> |
| 64 <script src="settings_main.js"></script> | 68 <script src="settings_main.js"></script> |
| 65 </dom-module> | 69 </dom-module> |
| OLD | NEW |