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

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

Issue 2438643004: MD Settings: Migrate cookies iron-dropdown to settings-action-menu. (Closed)
Patch Set: Nit. Created 4 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
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-dropdown/iron-drop down.html">
5 <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">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
7 <link rel="import" href="/i18n_setup.html"> 6 <link rel="import" href="/i18n_setup.html">
8 <link rel="import" href="/icons.html"> 7 <link rel="import" href="/icons.html">
9 <link rel="import" href="/route.html"> 8 <link rel="import" href="/route.html">
9 <link rel="import" href="/settings_action_menu.html">
10 <link rel="import" href="/settings_shared_css.html"> 10 <link rel="import" href="/settings_shared_css.html">
11 <link rel="import" href="/site_settings/add_site_dialog.html"> 11 <link rel="import" href="/site_settings/add_site_dialog.html">
12 <link rel="import" href="/site_settings/constants.html"> 12 <link rel="import" href="/site_settings/constants.html">
13 <link rel="import" href="/site_settings/site_settings_behavior.html"> 13 <link rel="import" href="/site_settings/site_settings_behavior.html">
14 <link rel="import" href="/site_settings/site_settings_prefs_browser_proxy.html"> 14 <link rel="import" href="/site_settings/site_settings_prefs_browser_proxy.html">
15 15
16 <dom-module id="site-list"> 16 <dom-module id="site-list">
17 <template> 17 <template>
18 <style include="settings-shared"> 18 <style include="settings-shared">
19 paper-button { 19 paper-button {
(...skipping 10 matching lines...) Expand all
30 } 30 }
31 </style> 31 </style>
32 <div id="category" hidden> 32 <div id="category" hidden>
33 <div class="settings-box first" hidden$="[[allSites]]"> 33 <div class="settings-box first" hidden$="[[allSites]]">
34 <h2 class="start">[[categoryHeader]]</h2> 34 <h2 class="start">[[categoryHeader]]</h2>
35 <paper-button class="secondary-button" id="icon" on-tap="onAddSiteTap_"> 35 <paper-button class="secondary-button" id="icon" on-tap="onAddSiteTap_">
36 $i18n{add} 36 $i18n{add}
37 </paper-button> 37 </paper-button>
38 </div> 38 </div>
39 39
40 <dialog is="settings-action-menu">
41 <button class="dropdown-item" role="option" id="allow"
42 on-tap="onAllowTap_" hidden$="[[!showAllowAction_]]">
43 $i18n{siteSettingsActionAllow}
44 </button>
45 <button class="dropdown-item" role="option" id="block"
46 on-tap="onBlockTap_" hidden$="[[!showBlockAction_]]">
47 $i18n{siteSettingsActionBlock}
48 </button>
49 <button class="dropdown-item" role="option" id="sessionOnly"
50 on-tap="onSessionOnlyTap_"
51 hidden$="[[!showSessionOnlyActionForSite_(actionMenuSite_)]]">
52 $i18n{siteSettingsActionSessionOnly}
53 </button>
54 <button class="dropdown-item" role="option" id="reset"
55 on-tap="onResetTap_">
56 $i18n{siteSettingsActionReset}
57 </button>
58 </dialog>
59
40 <div class="list-frame menu-content vertical-list" id="listContainer"> 60 <div class="list-frame menu-content vertical-list" id="listContainer">
41 <template is="dom-repeat" items="[[sites]]"> 61 <template is="dom-repeat" items="[[sites]]">
42 <div class="list-item"> 62 <div class="list-item">
43 <div class="start layout horizontal center" on-tap="onOriginTap_" 63 <div class="start layout horizontal center" on-tap="onOriginTap_"
44 actionable$="[[enableSiteSettings_]]"> 64 actionable$="[[enableSiteSettings_]]">
45 <div class="favicon-image" 65 <div class="favicon-image"
46 style$="[[computeSiteIcon(item.originForDisplay)]]"> 66 style$="[[computeSiteIcon(item.originForDisplay)]]">
47 </div> 67 </div>
48 <div class="middle"> 68 <div class="middle">
49 <div class="selectable">[[item.originForDisplay]]</div> 69 <div class="selectable">[[item.originForDisplay]]</div>
50 70
51 <!-- This div must not contain extra whitespace. --> 71 <!-- This div must not contain extra whitespace. -->
52 <div class="selectable secondary" 72 <div class="selectable secondary"
53 >[[computeSiteDescription_(item)]]</div> 73 >[[computeSiteDescription_(item)]]</div>
54 </div> 74 </div>
55 </div> 75 </div>
56 76
57 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]"> 77 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]">
58 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon> 78 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon>
59 </template> 79 </template>
60 80
61 <paper-icon-button id="dots" icon="cr:more-vert" toggles 81 <paper-icon-button id="dots" icon="cr:more-vert"
62 active="{{item.menuOpened}}" 82 hidden="[[isExceptionControlled_(item.source)]]"
63 hidden="[[isExceptionControlled_(item.source)]]"> 83 on-tap="onShowActionMenuTap_">
64 </paper-icon-button> 84 </paper-icon-button>
65 <template is="dom-if" if="[[item.menuOpened]]">
66 <iron-dropdown vertical-align="auto" horizontal-align="right"
67 opened="{{item.menuOpened}}">
68 <div class="dropdown-content">
69 <button class="dropdown-item" role="option" id="allow"
70 on-tap="onAllowTap_" hidden$="[[!showAllowAction_]]">
71 $i18n{siteSettingsActionAllow}
72 </button>
73 <button class="dropdown-item" role="option" id="block"
74 on-tap="onBlockTap_" hidden$="[[!showBlockAction_]]">
75 $i18n{siteSettingsActionBlock}
76 </button>
77 <button class="dropdown-item" role="option" id="sessionOnly"
78 on-tap="onSessionOnlyTap_"
79 hidden$="[[!showSessionOnlyActionForSite_(item)]]">
80 $i18n{siteSettingsActionSessionOnly}
81 </button>
82 <button class="dropdown-item" role="option" id="reset"
83 on-tap="onResetTap_">
84 $i18n{siteSettingsActionReset}
85 </button>
86 </div>
87 </iron-dropdown>
88 </template>
89 <template is="dom-if" if="[[enableSiteSettings_]]"> 85 <template is="dom-if" if="[[enableSiteSettings_]]">
90 <div on-tap="onOriginTap_" actionable> 86 <div on-tap="onOriginTap_" actionable>
91 <button class="subpage-arrow" is="paper-icon-button-light"> 87 <button class="subpage-arrow" is="paper-icon-button-light">
92 </button> 88 </button>
93 </div> 89 </div>
94 </template> 90 </template>
95 </div> 91 </div>
96 </template> 92 </template>
97 </div> 93 </div>
98 </div> 94 </div>
99 </template> 95 </template>
100 <script src="site_list.js"></script> 96 <script src="site_list.js"></script>
101 </dom-module> 97 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698