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..f24e7c087028355661c7836f5f7f52df6699fda7 100644 |
--- a/chrome/browser/resources/settings/location_page/location_page.html |
+++ b/chrome/browser/resources/settings/location_page/location_page.html |
@@ -1,5 +1,7 @@ |
<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"> |
@@ -13,31 +15,32 @@ |
<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_(contentSettingsType)}}" item-icon></iron-icon> |
Dan Beam
2015/09/29 16:38:55
{{ -> [[
|
<paper-item-body two-line class="flex"> |
- <div i18n-content="siteSettingsLocation"></div> |
- <div secondary i18n-content="siteSettingsAskBeforeAccessing"></div> |
+ <div>{{computeTitle_(contentSettingsType)}}</div> |
+ <div secondary>{{computeDesc_(contentSettingsType, globalDefault)}}</div> |
</paper-item-body> |
- <paper-toggle-button></paper-toggle-button> |
+ <paper-toggle-button id="toggle" checked="{{globalDefault}}" |
+ on-change="handleToggleChange_"></paper-toggle-button> |
</paper-icon-item> |
<paper-menu> |
- <paper-submenu> |
+ <paper-submenu hidden$="{{!showBlockedList_(block, globalDefault)}}"> |
<paper-item class="menu-trigger"> |
- <div>[[getTitleAndCount_("siteSettingsBlock", block.length)]]</div> |
+ <div>{{computeBlockedListHeader_(block)}}</div> |
</paper-item> |
<paper-menu class="menu-content"> |
<template is="dom-repeat" items="{{block}}"> |
- <paper-item>{{item.url}}</paper-item> |
+ <paper-item on-dblclick="handleDblClick_">{{item.url}}</paper-item> |
</template> |
</paper-menu> |
</paper-submenu> |
- <paper-submenu> |
+ <paper-submenu hidden$="{{!showAllowedList_(allow)}}"> |
<paper-item class="menu-trigger"> |
- <div>[[getTitleAndCount_("siteSettingsAllow", allow.length)]]</div> |
+ <div>{{computeAllowedListHeader_(allow, globalDefault)}}</div> |
</paper-item> |
<paper-menu class="menu-content"> |
<template is="dom-repeat" items="{{allow}}"> |
- <paper-item>{{item.url}}</paper-item> |
+ <paper-item on-dblclick="handleDblClick_">{{item.url}}</paper-item> |
</template> |
</paper-menu> |
</paper-submenu> |