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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 </settings-basic-page> | 68 </settings-basic-page> |
69 </template> | 69 </template> |
70 <template is="dom-if" | 70 <template is="dom-if" |
71 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | 71 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
72 <template is="dom-if" if="[[showAdvancedToggle_( | 72 <template is="dom-if" if="[[showAdvancedToggle_( |
73 showPages_.basic, hasExpandedSection_, previousShowPages_)]]"> | 73 showPages_.basic, hasExpandedSection_, previousShowPages_)]]"> |
74 <div id="toggleSpacer"></div> | 74 <div id="toggleSpacer"></div> |
75 <div id="toggleContainer"> | 75 <div id="toggleContainer"> |
76 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> | 76 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> |
77 <span>$i18n{advancedPageTitle}</span> | 77 <span>$i18n{advancedPageTitle}</span> |
78 <iron-icon icon="[[arrowState_(showPages_.advanced)]]"></iron-icon> | 78 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> |
| 79 </iron-icon> |
79 </paper-button> | 80 </paper-button> |
80 </div> | 81 </div> |
81 </template> | 82 </template> |
82 <template is="dom-if" if="[[showPages_.advanced]]"> | 83 <template is="dom-if" if="[[showPages_.advanced]]"> |
83 <settings-advanced-page route="ADVANCED" prefs="{{prefs}}" | 84 <settings-advanced-page route="ADVANCED" prefs="{{prefs}}" |
84 page-visibility="[[pageVisibility]]" | 85 page-visibility="[[pageVisibility]]" |
85 on-subpage-expand="onSubpageExpand_"> | 86 on-subpage-expand="onSubpageExpand_"> |
86 </settings-advanced-page> | 87 </settings-advanced-page> |
87 </template> | 88 </template> |
88 </template> | 89 </template> |
89 <template is="dom-if" if="[[showPages_.about]]"> | 90 <template is="dom-if" if="[[showPages_.about]]"> |
90 <settings-about-page route="ABOUT"></settings-about-page> | 91 <settings-about-page route="ABOUT"></settings-about-page> |
91 </template> | 92 </template> |
92 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 93 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
93 </template> | 94 </template> |
94 <script src="settings_main.js"></script> | 95 <script src="settings_main.js"></script> |
95 <script src="/search_settings.js"></script> | 96 <script src="/search_settings.js"></script> |
96 </dom-module> | 97 </dom-module> |
OLD | NEW |