| 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="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 6 <link rel="import" href="/about_page/about_page.html"> | 6 <link rel="import" href="/about_page/about_page.html"> |
| 7 <link rel="import" href="/advanced_page/advanced_page.html"> | 7 <link rel="import" href="/advanced_page/advanced_page.html"> |
| 8 <link rel="import" href="/basic_page/basic_page.html"> | 8 <link rel="import" href="/basic_page/basic_page.html"> |
| 9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 10 <link rel="import" href="/settings_page/main_page_behavior.html"> | 10 <link rel="import" href="/settings_page/main_page_behavior.html"> |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 on-subpage-expand="onSubpageExpand_" | 71 on-subpage-expand="onSubpageExpand_" |
| 72 on-freeze-scroll="onFreezeScroll_"> | 72 on-freeze-scroll="onFreezeScroll_"> |
| 73 </settings-basic-page> | 73 </settings-basic-page> |
| 74 </template> | 74 </template> |
| 75 <template is="dom-if" | 75 <template is="dom-if" |
| 76 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | 76 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
| 77 <template is="dom-if" if="[[showAdvancedToggle_( | 77 <template is="dom-if" if="[[showAdvancedToggle_( |
| 78 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> | 78 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> |
| 79 <div id="toggleSpacer"></div> | 79 <div id="toggleSpacer"></div> |
| 80 <h2 id="toggleContainer"> | 80 <h2 id="toggleContainer"> |
| 81 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> | 81 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_" toggles |
| 82 active="[[advancedToggleExpanded_]]" |
| 83 aria-active-attribute="aria-expanded"> |
| 82 <span>$i18n{advancedPageTitle}</span> | 84 <span>$i18n{advancedPageTitle}</span> |
| 83 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> | 85 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> |
| 84 </iron-icon> | 86 </iron-icon> |
| 85 </paper-button> | 87 </paper-button> |
| 86 </h2> | 88 </h2> |
| 87 </template> | 89 </template> |
| 88 <template is="dom-if" if="[[showAdvancedPage_( | 90 <template is="dom-if" if="[[showAdvancedPage_( |
| 89 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> | 91 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> |
| 90 <settings-advanced-page prefs="{{prefs}}" | 92 <settings-advanced-page prefs="{{prefs}}" |
| 91 page-visibility="[[pageVisibility]]" | 93 page-visibility="[[pageVisibility]]" |
| 92 on-subpage-expand="onSubpageExpand_" | 94 on-subpage-expand="onSubpageExpand_" |
| 93 on-freeze-scroll="onFreezeScroll_"> | 95 on-freeze-scroll="onFreezeScroll_"> |
| 94 </settings-advanced-page> | 96 </settings-advanced-page> |
| 95 </template> | 97 </template> |
| 96 </template> | 98 </template> |
| 97 <template is="dom-if" if="[[showPages_.about]]"> | 99 <template is="dom-if" if="[[showPages_.about]]"> |
| 98 <settings-about-page></settings-about-page> | 100 <settings-about-page></settings-about-page> |
| 99 </template> | 101 </template> |
| 100 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 102 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
| 101 </template> | 103 </template> |
| 102 <script src="settings_main.js"></script> | 104 <script src="settings_main.js"></script> |
| 103 <script src="/search_settings.js"></script> | 105 <script src="/search_settings.js"></script> |
| 104 </dom-module> | 106 </dom-module> |
| OLD | NEW |