Index: chrome/browser/resources/settings/location_page/location_page.html |
diff --git a/chrome/browser/resources/settings/location_page/location_page.html b/chrome/browser/resources/settings/location_page/location_page.html |
index 4c4e0ca8eaf66d0df61d4d9aa720f071a56425ad..450b6d283a82cf56863eb64e0d0e1089865b0eb8 100644 |
--- a/chrome/browser/resources/settings/location_page/location_page.html |
+++ b/chrome/browser/resources/settings/location_page/location_page.html |
@@ -1,11 +1,12 @@ |
<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/av-icons.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/communication-icons.html"> |
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-icon-item.html"> |
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-body.html"> |
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.html"> |
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submenu.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html"> |
+<link rel="import" href="chrome://md-settings/location_page/site_list.html"> |
+<link rel="import" href="chrome://md-settings/prefs/prefs.html"> |
<dom-module id="cr-settings-location-page"> |
<link rel="import" type="css" |
@@ -13,35 +14,22 @@ |
<link rel="import" type="css" href="location_page.css"> |
<template> |
<paper-icon-item> |
- <iron-icon icon="communication:location-on" item-icon></iron-icon> |
+ <iron-icon icon="[[computeIcon_(category)]]" item-icon></iron-icon> |
<paper-item-body two-line class="flex"> |
- <div i18n-content="siteSettingsLocation"></div> |
- <div secondary i18n-content="siteSettingsAskBeforeAccessing"></div> |
+ <div>[[computeTitle_(category)]]</div> |
+ <div secondary>[[computeDesc_(category, categoryEnabled)]]</div> |
</paper-item-body> |
- <paper-toggle-button></paper-toggle-button> |
+ <paper-toggle-button id="toggle" checked="{{categoryEnabled}}" |
+ on-change="handleToggleChange_"></paper-toggle-button> |
Dan Beam
2015/10/10 01:27:39
handleToggleChange_ -> onToggleChange_
Finnur
2015/10/15 15:46:32
Done (in site_settings_category.html).
|
</paper-icon-item> |
- <paper-menu> |
- <paper-submenu> |
- <paper-item class="menu-trigger"> |
- <div>[[getTitleAndCount_("siteSettingsBlock", block.length)]]</div> |
- </paper-item> |
- <paper-menu class="menu-content"> |
- <template is="dom-repeat" items="{{block}}"> |
- <paper-item>{{item.url}}</paper-item> |
- </template> |
- </paper-menu> |
- </paper-submenu> |
- <paper-submenu> |
- <paper-item class="menu-trigger"> |
- <div>[[getTitleAndCount_("siteSettingsAllow", allow.length)]]</div> |
- </paper-item> |
- <paper-menu class="menu-content"> |
- <template is="dom-repeat" items="{{allow}}"> |
- <paper-item>{{item.url}}</paper-item> |
- </template> |
- </paper-menu> |
- </paper-submenu> |
- </paper-menu> |
+ <cr-settings-site-list category="[[category]]" |
+ categories="[[categories]]" |
+ category-subtype="[[defaultValues.BLOCK]]" |
+ category-subtypes="[[defaultValues]]"></cr-settings-site-list> |
+ <cr-settings-site-list category="[[category]]" |
+ categories="[[categories]]" |
+ category-subtype="[[defaultValues.ALLOW]]" |
+ category-subtypes="[[defaultValues]]"></cr-settings-site-list> |
</template> |
<script src="location_page.js"></script> |
</dom-module> |