Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * @fileoverview | 6 * @fileoverview |
| 7 * 'settings-router' is a simple router for settings. Its responsibilities: | 7 * 'settings-router' is a simple router for settings. Its responsibilities: |
| 8 * - Update the URL when the routing state changes. | 8 * - Update the URL when the routing state changes. |
| 9 * - Initialize the routing state with the initial URL. | 9 * - Initialize the routing state with the initial URL. |
| 10 * - Process and validate all routing state changes. | 10 * - Process and validate all routing state changes. |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 135 subpageTitles: ['manageCertificates'], | 135 subpageTitles: ['manageCertificates'], |
| 136 }, | 136 }, |
| 137 { | 137 { |
| 138 url: '/siteSettings', | 138 url: '/siteSettings', |
| 139 page: 'advanced', | 139 page: 'advanced', |
| 140 section: 'privacy', | 140 section: 'privacy', |
| 141 subpage: ['site-settings'], | 141 subpage: ['site-settings'], |
| 142 subpageTitles: ['siteSettings'], | 142 subpageTitles: ['siteSettings'], |
| 143 }, | 143 }, |
| 144 { | 144 { |
| 145 url: '/siteSettings/category', | 145 url: '/siteSettings/category', |
|
tommycli
2016/01/05 18:28:58
This route is no longer needed right?
Finnur
2016/01/06 14:53:46
Correct.
| |
| 146 page: 'advanced', | 146 page: 'advanced', |
| 147 section: 'privacy', | 147 section: 'privacy', |
| 148 subpage: ['site-settings', 'site-settings-category'], | 148 subpage: ['site-settings', 'site-settings-category'], |
| 149 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | 149 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], |
| 150 }, | 150 }, |
| 151 { | 151 { |
| 152 url: '/siteSettings/category/camera', | |
| 153 page: 'advanced', | |
| 154 section: 'privacy', | |
| 155 subpage: ['site-settings', 'site-settings-category'], | |
| 156 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | |
| 157 }, | |
| 158 { | |
| 159 url: '/siteSettings/category/cookies', | |
| 160 page: 'advanced', | |
| 161 section: 'privacy', | |
| 162 subpage: ['site-settings', 'site-settings-category'], | |
|
tommycli
2016/01/04 18:12:09
final element is site-settings-cookies right?
and
Finnur
2016/01/05 15:54:07
I'm not sure how to proceed here...
These sub-pag
tommycli
2016/01/05 18:28:58
Hello,
No, the subpage strings here do not equal
Finnur
2016/01/06 14:53:46
Convinced.
However, I've not had luck now nor in
tommycli
2016/01/06 19:10:34
You can only define this.category from HTML if 'ca
Finnur
2016/01/07 13:14:49
|category| is already defined; it used to reside i
| |
| 163 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | |
|
tommycli
2016/01/04 18:12:09
final element is siteSettingsCookiesPageTitle righ
Finnur
2016/01/05 15:54:07
Yes, if we can resolve the above.
Finnur
2016/01/06 14:53:46
Done.
| |
| 164 }, | |
| 165 { | |
| 166 url: '/siteSettings/category/fullscreen', | |
| 167 page: 'advanced', | |
| 168 section: 'privacy', | |
| 169 subpage: ['site-settings', 'site-settings-category'], | |
| 170 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | |
| 171 }, | |
| 172 { | |
| 173 url: '/siteSettings/category/location', | |
| 174 page: 'advanced', | |
| 175 section: 'privacy', | |
| 176 subpage: ['site-settings', 'site-settings-category'], | |
| 177 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | |
| 178 }, | |
| 179 { | |
| 180 url: '/siteSettings/category/javascript', | |
| 181 page: 'advanced', | |
| 182 section: 'privacy', | |
| 183 subpage: ['site-settings', 'site-settings-category'], | |
| 184 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | |
| 185 }, | |
| 186 { | |
| 187 url: '/siteSettings/category/microphone', | |
| 188 page: 'advanced', | |
| 189 section: 'privacy', | |
| 190 subpage: ['site-settings', 'site-settings-category'], | |
| 191 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | |
| 192 }, | |
| 193 { | |
| 194 url: '/siteSettings/category/notifications', | |
| 195 page: 'advanced', | |
| 196 section: 'privacy', | |
| 197 subpage: ['site-settings', 'site-settings-category'], | |
| 198 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | |
| 199 }, | |
| 200 { | |
| 201 url: '/siteSettings/category/popups', | |
| 202 page: 'advanced', | |
| 203 section: 'privacy', | |
| 204 subpage: ['site-settings', 'site-settings-category'], | |
| 205 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle'], | |
| 206 }, | |
| 207 { | |
| 152 url: '/siteSettings/category/details', | 208 url: '/siteSettings/category/details', |
| 153 page: 'advanced', | 209 page: 'advanced', |
| 154 section: 'privacy', | 210 section: 'privacy', |
| 155 subpage: ['site-settings', 'site-settings-category', 'site-details'], | 211 subpage: ['site-settings', 'site-settings-category', 'site-details'], |
| 156 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle', | 212 subpageTitles: ['siteSettings', 'siteSettingsCategoryPageTitle', |
| 157 'siteSettingsSiteDetailsPageTitle'], | 213 'siteSettingsSiteDetailsPageTitle'], |
| 158 }, | 214 }, |
| 159 { | 215 { |
| 160 url: '/clearBrowserData', | 216 url: '/clearBrowserData', |
| 161 page: 'advanced', | 217 page: 'advanced', |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 258 history.replaceState(historicState, null); | 314 history.replaceState(historicState, null); |
| 259 } | 315 } |
| 260 | 316 |
| 261 return; | 317 return; |
| 262 } | 318 } |
| 263 } | 319 } |
| 264 | 320 |
| 265 assertNotReached('Route not found: ' + JSON.stringify(newRoute)); | 321 assertNotReached('Route not found: ' + JSON.stringify(newRoute)); |
| 266 }, | 322 }, |
| 267 }); | 323 }); |
| OLD | NEW |