Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(925)

Side by Side Diff: chrome/browser/resources/settings/settings_main/settings_main.html

Issue 2420833002: MD Settings: rework how advanced UI shows (Closed)
Patch Set: more tests Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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_" toggles 81 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}"
82 active="[[advancedToggleExpanded_]]" 82 aria-active-attribute="aria-expanded" toggles>
83 aria-active-attribute="aria-expanded">
84 <span>$i18n{advancedPageTitle}</span> 83 <span>$i18n{advancedPageTitle}</span>
85 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> 84 <iron-icon icon="[[arrowState_(advancedToggleExpanded)]]">
86 </iron-icon> 85 </iron-icon>
87 </paper-button> 86 </paper-button>
88 </h2> 87 </h2>
89 </template> 88 </template>
90 <template is="dom-if" if="[[showAdvancedPage_( 89 <template is="dom-if" if="[[showAdvancedPage_(
91 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> 90 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]">
92 <settings-advanced-page prefs="{{prefs}}" 91 <settings-advanced-page prefs="{{prefs}}"
93 page-visibility="[[pageVisibility]]" 92 page-visibility="[[pageVisibility]]"
94 on-subpage-expand="onSubpageExpand_" 93 on-subpage-expand="onSubpageExpand_"
95 on-freeze-scroll="onFreezeScroll_"> 94 on-freeze-scroll="onFreezeScroll_">
96 </settings-advanced-page> 95 </settings-advanced-page>
97 </template> 96 </template>
98 </template> 97 </template>
99 <template is="dom-if" if="[[showPages_.about]]"> 98 <template is="dom-if" if="[[showPages_.about]]">
100 <settings-about-page></settings-about-page> 99 <settings-about-page></settings-about-page>
101 </template> 100 </template>
102 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> 101 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div>
103 </template> 102 </template>
104 <script src="settings_main.js"></script> 103 <script src="settings_main.js"></script>
105 <script src="/search_settings.js"></script> 104 <script src="/search_settings.js"></script>
106 </dom-module> 105 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698