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

Unified Diff: chrome/browser/resources/settings/location_page/location_page.html

Issue 1372053002: Flesh out the location-page class to make it more general. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split list into two Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
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..eba5e8b2b402b24a1b02a029c79a470bae07f07d 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-flex-layout/classes/iron-flex-layout.html">
Dan Beam 2015/10/05 16:52:57 why do you need this?
Finnur 2015/10/06 16:31:09 I don't think I do. Must have been something I was
+<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">
<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, toggleState)]]</div>
</paper-item-body>
- <paper-toggle-button></paper-toggle-button>
+ <paper-toggle-button id="toggle" checked="{{toggleState}}"
+ on-change="handleToggleChange_"></paper-toggle-button>
</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="[[allowOrBlock.BLOCK]]"
+ category-subtypes="[[allowOrBlock]]"></cr-settings-site-list>
+ <cr-settings-site-list category="[[category]]"
+ categories="[[categories]]"
+ category-subtype="[[allowOrBlock.ALLOW]]"
+ category-subtypes="[[allowOrBlock]]"></cr-settings-site-list>
</template>
<script src="location_page.js"></script>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698