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

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

Issue 2866463002: Revert of MD Settings: Elim SettingsSubpageBrowsertest and SettingsPageVisibility (Closed)
Patch Set: Created 3 years, 7 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
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/assert.html"> 2 <link rel="import" href="chrome://resources/html/assert.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
5 <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/iron-icon/iron-icon.htm l">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
8 <link rel="import" href="../icons.html"> 8 <link rel="import" href="../icons.html">
9 <link rel="import" href="../route.html"> 9 <link rel="import" href="../route.html">
10 <link rel="import" href="../settings_shared_css.html"> 10 <link rel="import" href="../settings_shared_css.html">
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 <if expr="chromeos"> 84 <if expr="chromeos">
85 <a href="/internet"> 85 <a href="/internet">
86 <iron-icon icon="settings:network-wifi"></iron-icon> 86 <iron-icon icon="settings:network-wifi"></iron-icon>
87 $i18n{internetPageTitle} 87 $i18n{internetPageTitle}
88 </a> 88 </a>
89 <a href="/bluetooth"> 89 <a href="/bluetooth">
90 <iron-icon icon="settings:bluetooth"></iron-icon> 90 <iron-icon icon="settings:bluetooth"></iron-icon>
91 $i18n{bluetoothPageTitle} 91 $i18n{bluetoothPageTitle}
92 </a> 92 </a>
93 </if> 93 </if>
94 <a id="people" href="/people" 94 <a id="people" href="/people" hidden="[[!pageVisibility.people]]">
95 hidden="[[!showPage_(pageVisibility.people)]]">
96 <iron-icon icon="cr:person"></iron-icon> 95 <iron-icon icon="cr:person"></iron-icon>
97 $i18n{peoplePageTitle} 96 $i18n{peoplePageTitle}
98 </a> 97 </a>
99 <a href="/appearance" hidden="[[!showPage_(pageVisibility.appearance)]]"> 98 <a href="/appearance" hidden="[[!pageVisibility.appearance]]">
100 <iron-icon icon="settings:palette"></iron-icon> 99 <iron-icon icon="settings:palette"></iron-icon>
101 $i18n{appearancePageTitle} 100 $i18n{appearancePageTitle}
102 </a> 101 </a>
103 <if expr="chromeos"> 102 <if expr="chromeos">
104 <a href="/device"> 103 <a href="/device">
105 <iron-icon icon="settings:laptop-chromebook"></iron-icon> 104 <iron-icon icon="settings:laptop-chromebook"></iron-icon>
106 $i18n{devicePageTitle} 105 $i18n{devicePageTitle}
107 </a> 106 </a>
108 </if> 107 </if>
109 <a href="/search"> 108 <a href="/search">
110 <iron-icon icon="cr:search"></iron-icon> 109 <iron-icon icon="cr:search"></iron-icon>
111 $i18n{searchPageTitle} 110 $i18n{searchPageTitle}
112 </a> 111 </a>
113 <if expr="chromeos"> 112 <if expr="chromeos">
114 <a href="/androidApps" 113 <a href="/androidApps" hidden="[[!showAndroidApps]]">
115 hidden="[[!showPage_(pageVisibility.androidApps)]]">
116 <iron-icon icon="settings:android"></iron-icon> 114 <iron-icon icon="settings:android"></iron-icon>
117 $i18n{androidAppsPageTitle} 115 $i18n{androidAppsPageTitle}
118 </a> 116 </a>
119 </if> 117 </if>
120 <if expr="not chromeos"> 118 <if expr="not chromeos">
121 <a href="/defaultBrowser" 119 <a href="/defaultBrowser" hidden="[[!pageVisibility.defaultBrowser]]">
122 hidden="[[!showPage_(pageVisibility.defaultBrowser)]]">
123 <iron-icon icon="settings:web"></iron-icon> 120 <iron-icon icon="settings:web"></iron-icon>
124 $i18n{defaultBrowser} 121 $i18n{defaultBrowser}
125 </a> 122 </a>
126 </if> 123 </if>
127 <a href="/onStartup" hidden="[[!showPage_(pageVisibility.onStartup)]]"> 124 <a href="/onStartup" hidden="[[!pageVisibility.onStartup]]">
128 <iron-icon icon="settings:power-settings-new"></iron-icon> 125 <iron-icon icon="settings:power-settings-new"></iron-icon>
129 $i18n{onStartup} 126 $i18n{onStartup}
130 </a> 127 </a>
131 <paper-button toggles id="advancedButton" 128 <paper-button toggles id="advancedButton"
132 aria-active-attribute="aria-expanded" active="{{advancedOpened}}" 129 aria-active-attribute="aria-expanded" active="{{advancedOpened}}"
133 hidden="[[!showPage_(pageVisibility.advancedSettings)]]"> 130 hidden="[[!pageVisibility.advancedSettings]]">
134 <span>$i18n{advancedPageTitle}</span> 131 <span>$i18n{advancedPageTitle}</span>
135 <iron-icon icon="[[arrowState_(advancedOpened)]]"> 132 <iron-icon icon="[[arrowState_(advancedOpened)]]">
136 </iron-icon></paper-button> 133 </iron-icon></paper-button>
137 <iron-collapse id="advancedSubmenu" opened="[[advancedOpened]]" 134 <iron-collapse id="advancedSubmenu" opened="[[advancedOpened]]"
138 hidden="[[!showPage_(pageVisibility.advancedSettings)]]"> 135 hidden="[[!pageVisibility.advancedSettings]]">
139 <iron-selector id="subMenu" selectable="a" attr-for-selected="href"> 136 <iron-selector id="subMenu" selectable="a" attr-for-selected="href">
140 <if expr="chromeos"> 137 <if expr="chromeos">
141 <a href="/dateTime"> 138 <a href="/dateTime">
142 <iron-icon icon="settings:access-time"></iron-icon> 139 <iron-icon icon="settings:access-time"></iron-icon>
143 $i18n{dateTimePageTitle} 140 $i18n{dateTimePageTitle}
144 </a> 141 </a>
145 </if> 142 </if>
146 <a href="/privacy"> 143 <a href="/privacy">
147 <iron-icon icon="settings:security"></iron-icon> 144 <iron-icon icon="settings:security"></iron-icon>
148 $i18n{privacyPageTitle} 145 $i18n{privacyPageTitle}
149 </a> 146 </a>
150 <a href="/passwordsAndForms" 147 <a href="/passwordsAndForms"
151 hidden="[[!showPage_(pageVisibility.passwordsAndForms)]]"> 148 hidden="[[!pageVisibility.passwordsAndForms]]">
152 <iron-icon icon="settings:assignment"></iron-icon> 149 <iron-icon icon="settings:assignment"></iron-icon>
153 $i18n{passwordsAndAutofillPageTitle} 150 $i18n{passwordsAndAutofillPageTitle}
154 </a> 151 </a>
155 <a href="/languages"> 152 <a href="/languages">
156 <iron-icon icon="settings:language"></iron-icon> 153 <iron-icon icon="settings:language"></iron-icon>
157 $i18n{languagesPageTitle} 154 $i18n{languagesPageTitle}
158 </a> 155 </a>
159 <a href="/downloads"> 156 <a href="/downloads">
160 <iron-icon icon="cr:file-download"></iron-icon> 157 <iron-icon icon="cr:file-download"></iron-icon>
161 $i18n{downloadsPageTitle} 158 $i18n{downloadsPageTitle}
162 </a> 159 </a>
163 <a href="/printing"> 160 <a href="/printing">
164 <iron-icon icon="cr:print"></iron-icon> 161 <iron-icon icon="cr:print"></iron-icon>
165 $i18n{printingPageTitle} 162 $i18n{printingPageTitle}
166 </a> 163 </a>
167 <a href="/accessibility"> 164 <a href="/accessibility">
168 <iron-icon icon="settings:accessibility"></iron-icon> 165 <iron-icon icon="settings:accessibility"></iron-icon>
169 $i18n{a11yPageTitle} 166 $i18n{a11yPageTitle}
170 </a> 167 </a>
171 <if expr="not chromeos"> 168 <if expr="not chromeos">
172 <a href="/system"> 169 <a href="/system">
173 <iron-icon icon="settings:build"></iron-icon> 170 <iron-icon icon="settings:build"></iron-icon>
174 $i18n{systemPageTitle} 171 $i18n{systemPageTitle}
175 </a> 172 </a>
176 </if> 173 </if>
177 <a href="/reset" hidden="[[!showPage_(pageVisibility.reset)]]"> 174 <a href="/reset" hidden="[[!pageVisibility.reset]]">
178 <iron-icon icon="settings:restore"></iron-icon> 175 <iron-icon icon="settings:restore"></iron-icon>
179 $i18n{resetPageTitle} 176 $i18n{resetPageTitle}
180 </a> 177 </a>
181 </iron-selector> 178 </iron-selector>
182 </iron-collapse> 179 </iron-collapse>
183 <div class="separator"></div> 180 <div class="separator"></div>
184 <a id="about-menu" href="/help">$i18n{aboutPageTitle}</a> 181 <a id="about-menu" href="/help">$i18n{aboutPageTitle}</a>
185 </iron-selector> 182 </iron-selector>
186 </template> 183 </template>
187 <script src="settings_menu.js"></script> 184 <script src="settings_menu.js"></script>
188 </dom-module> 185 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698