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

Side by Side Diff: chrome/browser/resources/settings/site_settings/site_list.html

Issue 2298283002: Site Settings Desktop: Support adding exceptions for incognito mode. (Closed)
Patch Set: Fix test Created 4 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 1 <link rel="import" href="chrome://resources/cr_elements/icons.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-icon/iron-icon.htm l"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 5 <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-icon-button/paper -icon-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu-button/paper -menu-button.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu-button/paper -menu-button.html">
10 <link rel="import" href="/i18n_setup.html"> 10 <link rel="import" href="/i18n_setup.html">
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 <template is="dom-repeat" items="[[sites]]"> 43 <template is="dom-repeat" items="[[sites]]">
44 <div class="list-item"> 44 <div class="list-item">
45 <div class="start layout horizontal center" on-tap="onOriginTap_" 45 <div class="start layout horizontal center" on-tap="onOriginTap_"
46 actionable$="[[!isPolicyControlled_(item.source)]]"> 46 actionable$="[[!isPolicyControlled_(item.source)]]">
47 <div class="favicon-image" 47 <div class="favicon-image"
48 style$="[[computeSiteIcon(item.originForDisplay)]]"> 48 style$="[[computeSiteIcon(item.originForDisplay)]]">
49 </div> 49 </div>
50 <div class="middle"> 50 <div class="middle">
51 <div class="selectable">[[item.originForDisplay]]</div> 51 <div class="selectable">[[item.originForDisplay]]</div>
52 <div class="selectable secondary"> 52 <div class="selectable secondary">
53 [[item.embeddingOriginForDisplay]] 53 [[computeSiteDescription_(item)]]
54 </div> 54 </div>
55 </div> 55 </div>
56 </div> 56 </div>
57 57
58 <template is="dom-if" if="[[isPolicyControlled_(item.source)]]"> 58 <template is="dom-if" if="[[isPolicyControlled_(item.source)]]">
59 <iron-icon icon="cr:domain"></iron-icon> 59 <iron-icon icon="cr:domain"></iron-icon>
60 </template> 60 </template>
61 <paper-menu-button hidden="[[!shouldShowMenu_(item.source)]]" 61 <paper-menu-button hidden="[[!shouldShowMenu_(item.source)]]"
62 horizontal-align="right"> 62 horizontal-align="right">
63 <paper-icon-button icon="cr:more-vert" class="dropdown-trigger"> 63 <paper-icon-button icon="cr:more-vert" class="dropdown-trigger">
64 </paper-icon-button> 64 </paper-icon-button>
65 <paper-menu id="actionMenu" class="dropdown-content" 65 <paper-menu id="actionMenu" class="dropdown-content"
66 on-iron-activate="onActionMenuIronActivate_" 66 on-iron-activate="onActionMenuIronActivate_"
67 attr-for-selected="menu-value"> 67 attr-for-selected="menu-value">
68 <paper-item 68 <paper-item
69 hidden="[[!showAllowAction_]]" 69 hidden="[[!showAllowAction_]]"
70 menu-value$="[[PermissionValues.ALLOW]]"> 70 menu-value$="[[PermissionValues.ALLOW]]">
71 $i18n{siteSettingsActionAllow} 71 $i18n{siteSettingsActionAllow}
72 </paper-item> 72 </paper-item>
73 <paper-item 73 <paper-item
74 hidden="[[!showBlockAction_]]" 74 hidden="[[!showBlockAction_]]"
75 menu-value$="[[PermissionValues.BLOCK]]"> 75 menu-value$="[[PermissionValues.BLOCK]]">
76 $i18n{siteSettingsActionBlock} 76 $i18n{siteSettingsActionBlock}
77 </paper-item> 77 </paper-item>
78 <paper-item 78 <paper-item
79 hidden="[[!showSessionOnlyAction_]]" 79 hidden="[[!showSessionOnlyActionForSite_(item)]]"
80 menu-value$="[[PermissionValues.SESSION_ONLY]]"> 80 menu-value$="[[PermissionValues.SESSION_ONLY]]">
81 $i18n{siteSettingsActionSessionOnly} 81 $i18n{siteSettingsActionSessionOnly}
82 </paper-item> 82 </paper-item>
83 <paper-item 83 <paper-item
84 menu-value$="[[PermissionValues.DEFAULT]]"> 84 menu-value$="[[PermissionValues.DEFAULT]]">
85 $i18n{siteSettingsActionReset} 85 $i18n{siteSettingsActionReset}
86 </paper-item> 86 </paper-item>
87 </paper-menu> 87 </paper-menu>
88 </paper-menu-button> 88 </paper-menu-button>
89 </div> 89 </div>
90 </template> 90 </template>
91 91
92 <template is="dom-if" if="[[!allSites]]"> 92 <template is="dom-if" if="[[!allSites]]">
93 <div class="list-item list-button" on-tap="onAddSiteTap_"> 93 <div class="list-item list-button" on-tap="onAddSiteTap_">
94 $i18n{addSiteLink} 94 $i18n{addSiteLink}
95 </div> 95 </div>
96 </template> 96 </template>
97 </div> 97 </div>
98 </paper-submenu> 98 </paper-submenu>
99 </template> 99 </template>
100 <script src="site_list.js"></script> 100 <script src="site_list.js"></script>
101 </dom-module> 101 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698