chrome/browser/resources/settings/location_page/site_list.html - Issue 1372053002: Flesh out the location-page class to make it more general.

Side by Side Diff: chrome/browser/resources/settings/location_page/site_list.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: Address feedback: CLs 4 through 7 (inclusive) Created 5 years, 2 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

« chrome/browser/resources/settings/advanced_page/advanced_page.js ('K') | « chrome/browser/resources/settings/location_page/location_page.js ('k') | chrome/browser/resources/settings/location_page/site_list.js » ('j') | chrome/browser/resources/settings/site_settings/constants.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.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/iron-icons/communicatio n-icons.html">

	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml">

	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml">

	6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html">

	7

	8 <dom-module id="settings-site-list">
	Dan Beam 2015/10/19 07:18:05 this should be in a site_settings_list or site_set this should be in a site_settings_list or site_settings directory, not location_page Finnur 2015/10/19 13:53:58 Oh, noes. My bad. :( These two files (location_pag Oh, noes. My bad. :( These two files (location_page/site_list.html/js) are redundant. When I moved them to the site_settings folder I must have forgotten to close them, so my editor decided to preserve the old copies and I simply missed that when I uploaded (I generally review my changes before publishing my updates, but new files I prefer to review in my editor with syntax highlighting and all). I'll make the suggested changes (those that still apply) but to the right site_list.html and .js files, of course. My apologies for the confusion!
	9 <link rel="import" type="css"

	10 href="chrome://md-settings/settings_page/settings_page.css">
	Dan Beam 2015/10/19 07:18:05 nit: don't wrap, also don't use chrome://md-settin nit: don't wrap, also don't use chrome://md-setting/ IMO Finnur 2015/10/19 13:53:58 Not a problem. FWIW the chrome://md-setting/ conve Not a problem. FWIW the chrome://md-setting/ convention came from the original (location_page.html). :)
	11 <link rel="import" type="css" href="site_list.css">

	12 <template>

	13 <paper-menu>

	14 <paper-submenu>

	15 <paper-item class="menu-trigger">

	16 <div>[[computeSiteListHeader_(siteList_, toggleState_)]]</div>

	17 </paper-item>

	18 <paper-menu class="menu-content">

	19 <template is="dom-repeat" items="{{siteList_}}">

	20 <div class="horizontal layout center">

	21 <div><iron-icon

	22 icon="[[computeSiteIcon_(item.url)]]"

	23 item-icon></iron-icon></div>

	24 <div class="flex"><paper-item

	25 on-click="handleClick_">[[item.url]]</paper-item></div>

	26 <div>

	27 <paper-menu-button>

	28 <paper-icon-button icon="menu" class="dropdown-trigger"

	29 alt="menu"></paper-icon-button>

	30 <paper-menu id="actionMenu" class="dropdown-content"

	31 on-iron-select="onActionMenuIronSelect_">

	32 <template is="dom-if" if="[[showAllowAction_]]">

	33 <paper-item

	34 value="Allow">[[allowActionLabel_]]</paper-item>

	35 </template>

	36 <template is="dom-if" if="[[showBlockAction_]]">

	37 <paper-item

	38 value="Block">[[blockActionLabel_]]</paper-item>

	39 </template>

	40 <paper-item value="Reset">[[resetActionLabel_]]</paper-item>

	41 </paper-menu>

	42 </paper-menu-button>

	43 </div>

	44 </div>

	45 </template>

	46 </paper-menu>

	47 </paper-submenu>

	48 </paper-menu>

	49 </template>

	50 <script src="site_list.js"></script>

	51 </dom-module>

OLD	NEW