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

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

Issue 2237823003: Site Settings Desktop: Implement USB devices section. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address feedback Created 4 years, 4 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 | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/route.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/policy/cr_policy_vars_cs s.html"> 1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.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/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html"> 7 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html">
8 <link rel="import" href="/controls/settings_checkbox.html"> 8 <link rel="import" href="/controls/settings_checkbox.html">
9 <link rel="import" href="/route.html"> 9 <link rel="import" href="/route.html">
10 <link rel="import" href="/settings_page/settings_animated_pages.html"> 10 <link rel="import" href="/settings_page/settings_animated_pages.html">
11 <link rel="import" href="/settings_page/settings_subpage.html"> 11 <link rel="import" href="/settings_page/settings_subpage.html">
12 <link rel="import" href="/settings_shared_css.html"> 12 <link rel="import" href="/settings_shared_css.html">
13 <link rel="import" href="/site_settings/all_sites.html"> 13 <link rel="import" href="/site_settings/all_sites.html">
14 <link rel="import" href="/site_settings/constants.html"> 14 <link rel="import" href="/site_settings/constants.html">
15 <link rel="import" href="/site_settings/media_picker.html"> 15 <link rel="import" href="/site_settings/media_picker.html">
16 <link rel="import" href="/site_settings/protocol_handlers.html"> 16 <link rel="import" href="/site_settings/protocol_handlers.html">
17 <link rel="import" href="/site_settings/usb_devices.html">
17 <link rel="import" href="/site_settings/site_data.html"> 18 <link rel="import" href="/site_settings/site_data.html">
18 <link rel="import" href="/site_settings_page/site_settings_page.html"> 19 <link rel="import" href="/site_settings_page/site_settings_page.html">
19 20
20 <if expr="use_nss_certs"> 21 <if expr="use_nss_certs">
21 <link rel="import" href="/certificate_manager_page/certificate_manager_page.html "> 22 <link rel="import" href="/certificate_manager_page/certificate_manager_page.html ">
22 </if> 23 </if>
23 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html"> 24 <link rel="import" href="/privacy_page/privacy_page_browser_proxy.html">
24 25
25 <dom-module id="settings-privacy-page"> 26 <dom-module id="settings-privacy-page">
26 <template> 27 <template>
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 </settings-subpage> 280 </settings-subpage>
280 </template> 281 </template>
281 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" no-sea rch> 282 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" no-sea rch>
282 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"> 283 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}">
283 <site-settings-category 284 <site-settings-category
284 selected-site="{{selectedSite}}" 285 selected-site="{{selectedSite}}"
285 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> 286 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
286 </site-settings-category> 287 </site-settings-category>
287 </settings-subpage> 288 </settings-subpage>
288 </template> 289 </template>
290 <template is="dom-if" route-path="/siteSettings/usbDevices" no-search>
291 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}">
292 <usb-devices></usb-devices>
293 </settings-subpage>
294 </template>
289 295
290 <template is="dom-if" name="site-details" no-search> 296 <template is="dom-if" name="site-details" no-search>
291 <settings-subpage page-title="[[selectedSite.originForDisplay]]"> 297 <settings-subpage page-title="[[selectedSite.originForDisplay]]">
292 <site-details site="[[selectedSite]]"></site-details> 298 <site-details site="[[selectedSite]]"></site-details>
293 </settings-subpage> 299 </settings-subpage>
294 </template> 300 </template>
295 </settings-animated-pages> 301 </settings-animated-pages>
296 </template> 302 </template>
297 <script src="privacy_page.js"></script> 303 <script src="privacy_page.js"></script>
298 </dom-module> 304 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/route.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698