| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 5 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog.
html"> | 5 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog.
html"> |
| 6 <link rel="import" href="/controls/settings_checkbox.html"> | 6 <link rel="import" href="/controls/settings_checkbox.html"> |
| 7 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 7 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 8 <link rel="import" href="/settings_page/settings_subpage.html"> | 8 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 9 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
| 10 <link rel="import" href="/site_settings/all_sites.html"> | 10 <link rel="import" href="/site_settings/all_sites.html"> |
| 11 <link rel="import" href="/site_settings/constants.html"> | 11 <link rel="import" href="/site_settings/constants.html"> |
| 12 <link rel="import" href="/site_settings/media_picker.html"> |
| 12 <link rel="import" href="/site_settings_page/site_settings_page.html"> | 13 <link rel="import" href="/site_settings_page/site_settings_page.html"> |
| 13 | 14 |
| 14 <if expr="use_nss_certs"> | 15 <if expr="use_nss_certs"> |
| 15 <link rel="import" href="/certificate_manager_page/certificate_manager_page.html
"> | 16 <link rel="import" href="/certificate_manager_page/certificate_manager_page.html
"> |
| 16 </if> | 17 </if> |
| 17 <if expr="is_win or is_macosx"> | 18 <if expr="is_win or is_macosx"> |
| 18 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> | 19 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> |
| 19 </if> | 20 </if> |
| 20 | 21 |
| 21 <dom-module id="settings-privacy-page"> | 22 <dom-module id="settings-privacy-page"> |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> | 143 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> |
| 143 </site-settings-category> | 144 </site-settings-category> |
| 144 </settings-subpage> | 145 </settings-subpage> |
| 145 </template> | 146 </template> |
| 146 <template is="dom-if" name="site-settings-category-camera"> | 147 <template is="dom-if" name="site-settings-category-camera"> |
| 147 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> | 148 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> |
| 148 <site-settings-category | 149 <site-settings-category |
| 149 selected-site="{{selectedSite}}" | 150 selected-site="{{selectedSite}}" |
| 150 current-route="{{currentRoute}}" | 151 current-route="{{currentRoute}}" |
| 151 category="{{ContentSettingsTypes.CAMERA}}"> | 152 category="{{ContentSettingsTypes.CAMERA}}"> |
| 153 <media-picker type="camera" class="media-picker"></media-picker> |
| 152 </site-settings-category> | 154 </site-settings-category> |
| 153 </settings-subpage> | 155 </settings-subpage> |
| 154 </template> | 156 </template> |
| 155 <template is="dom-if" name="site-settings-category-cookies"> | 157 <template is="dom-if" name="site-settings-category-cookies"> |
| 156 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> | 158 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> |
| 157 <site-settings-category | 159 <site-settings-category |
| 158 prefs="{{prefs}}" | 160 prefs="{{prefs}}" |
| 159 selected-site="{{selectedSite}}" | 161 selected-site="{{selectedSite}}" |
| 160 current-route="{{currentRoute}}" | 162 current-route="{{currentRoute}}" |
| 161 category="{{ContentSettingsTypes.COOKIES}}"> | 163 category="{{ContentSettingsTypes.COOKIES}}"> |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 </site-settings-category> | 211 </site-settings-category> |
| 210 </settings-subpage> | 212 </settings-subpage> |
| 211 </template> | 213 </template> |
| 212 <template is="dom-if" name="site-settings-category-microphone"> | 214 <template is="dom-if" name="site-settings-category-microphone"> |
| 213 <settings-subpage | 215 <settings-subpage |
| 214 page-title="$i18n{siteSettingsCategoryMicrophone}"> | 216 page-title="$i18n{siteSettingsCategoryMicrophone}"> |
| 215 <site-settings-category | 217 <site-settings-category |
| 216 selected-site="{{selectedSite}}" | 218 selected-site="{{selectedSite}}" |
| 217 current-route="{{currentRoute}}" | 219 current-route="{{currentRoute}}" |
| 218 category="{{ContentSettingsTypes.MIC}}"> | 220 category="{{ContentSettingsTypes.MIC}}"> |
| 221 <media-picker type="mic" class="media-picker"></media-picker> |
| 219 </site-settings-category> | 222 </site-settings-category> |
| 220 </settings-subpage> | 223 </settings-subpage> |
| 221 </template> | 224 </template> |
| 222 <template is="dom-if" name="site-settings-category-notifications"> | 225 <template is="dom-if" name="site-settings-category-notifications"> |
| 223 <settings-subpage | 226 <settings-subpage |
| 224 page-title="$i18n{siteSettingsCategoryNotifications}"> | 227 page-title="$i18n{siteSettingsCategoryNotifications}"> |
| 225 <site-settings-category | 228 <site-settings-category |
| 226 selected-site="{{selectedSite}}" | 229 selected-site="{{selectedSite}}" |
| 227 current-route="{{currentRoute}}" | 230 current-route="{{currentRoute}}" |
| 228 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> | 231 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 <template is="dom-if" name="site-details"> | 263 <template is="dom-if" name="site-details"> |
| 261 <settings-subpage | 264 <settings-subpage |
| 262 page-title="$i18n{siteSettingsSiteDetailsPageTitle}"> | 265 page-title="$i18n{siteSettingsSiteDetailsPageTitle}"> |
| 263 <site-details site="[[selectedSite]]"></site-details> | 266 <site-details site="[[selectedSite]]"></site-details> |
| 264 </settings-subpage> | 267 </settings-subpage> |
| 265 </template> | 268 </template> |
| 266 </settings-animated-pages> | 269 </settings-animated-pages> |
| 267 </template> | 270 </template> |
| 268 <script src="privacy_page.js"></script> | 271 <script src="privacy_page.js"></script> |
| 269 </dom-module> | 272 </dom-module> |
| OLD | NEW |