Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| 2 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> | 2 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> |
| 3 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html "> | 3 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html "> |
| 4 <link rel="import" href="chrome://md-settings/languages_page/languages_page.html "> | 4 <link rel="import" href="chrome://md-settings/languages_page/languages_page.html "> |
| 5 <link rel="import" href="chrome://md-settings/location_page/location_page.html"> | |
| 6 <link rel="import" href="chrome://md-settings/privacy_page/privacy_page.html"> | 5 <link rel="import" href="chrome://md-settings/privacy_page/privacy_page.html"> |
| 7 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l"> | 6 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l"> |
| 7 <link rel="import" href="chrome://md-settings/site_settings/constants.html"> | |
| 8 <link rel="import" href="chrome://md-settings/site_settings/site_settings_catego ry.html"> | |
| 8 <link rel="import" href="chrome://md-settings/sync_page/sync_page.html"> | 9 <link rel="import" href="chrome://md-settings/sync_page/sync_page.html"> |
| 9 | 10 |
| 10 <if expr="chromeos"> | 11 <if expr="chromeos"> |
| 11 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html "> | 12 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html "> |
| 12 </if> | 13 </if> |
| 13 | 14 |
| 14 <dom-module id="cr-settings-advanced-page"> | 15 <dom-module id="cr-settings-advanced-page"> |
| 15 <template> | 16 <template> |
| 16 <if expr="chromeos"> | 17 <if expr="chromeos"> |
| 17 <cr-settings-section i18n-values="page-title:dateTimePageTitle" | 18 <cr-settings-section i18n-values="page-title:dateTimePageTitle" |
| 18 expand-container="{{expandContainer}}" | 19 expand-container="{{expandContainer}}" |
| 19 current-route="[[currentRoute]]" section="dateTime"> | 20 current-route="[[currentRoute]]" section="dateTime"> |
| 20 <cr-settings-date-time-page prefs="{{prefs}}"> | 21 <cr-settings-date-time-page prefs="{{prefs}}"> |
| 21 </cr-settings-date-time-page> | 22 </cr-settings-date-time-page> |
| 22 </cr-settings-section> | 23 </cr-settings-section> |
| 23 </if> | 24 </if> |
| 24 <cr-settings-section i18n-values="page-title:siteSettingsLocation" | 25 <cr-settings-section i18n-values="page-title:siteSettingsLocation" |
| 25 expand-container="{{expandContainer}}" | 26 expand-container="{{expandContainer}}" |
| 26 current-route="[[currentRoute]]" section="location"> | 27 current-route="[[currentRoute]]" section="location"> |
| 27 <cr-settings-location-page prefs="{{prefs}}"> | 28 <cr-site-settings-category id="locationCategory" prefs="{{prefs}}"> |
| 28 </cr-settings-location-page> | 29 </cr-site-settings-category> |
|
Dan Beam
2015/10/19 07:18:06
rebase and/or remove "cr-"
Finnur
2015/10/19 13:53:58
I'm not sure what rebase means in this context, bu
| |
| 29 </cr-settings-section> | 30 </cr-settings-section> |
| 30 | 31 |
| 31 <cr-settings-section i18n-values="page-title:privacyPageTitle" | 32 <cr-settings-section i18n-values="page-title:privacyPageTitle" |
| 32 expand-container="{{expandContainer}}" | 33 expand-container="{{expandContainer}}" |
| 33 current-route="[[currentRoute]]" section="privacy"> | 34 current-route="[[currentRoute]]" section="privacy"> |
| 34 <cr-settings-privacy-page prefs="{{prefs}}" | 35 <cr-settings-privacy-page prefs="{{prefs}}" |
| 35 current-route="{{currentRoute}}"> | 36 current-route="{{currentRoute}}"> |
| 36 </cr-settings-privacy-page> | 37 </cr-settings-privacy-page> |
| 37 </cr-settings-section> | 38 </cr-settings-section> |
| 38 | 39 |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 58 </cr-settings-section> | 59 </cr-settings-section> |
| 59 | 60 |
| 60 <cr-settings-section i18n-values="page-title:syncPageTitle" | 61 <cr-settings-section i18n-values="page-title:syncPageTitle" |
| 61 expand-container="{{expandContainer}}" | 62 expand-container="{{expandContainer}}" |
| 62 current-route="[[currentRoute]]" section="sync"> | 63 current-route="[[currentRoute]]" section="sync"> |
| 63 <cr-settings-sync-page></cr-settings-sync-page> | 64 <cr-settings-sync-page></cr-settings-sync-page> |
| 64 </cr-settings-section> | 65 </cr-settings-section> |
| 65 </template> | 66 </template> |
| 66 <script src="advanced_page.js"></script> | 67 <script src="advanced_page.js"></script> |
| 67 </dom-module> | 68 </dom-module> |
| OLD | NEW |