| Index: chrome/browser/resources/settings/site_settings/site_list.html
|
| diff --git a/chrome/browser/resources/settings/site_settings/site_list.html b/chrome/browser/resources/settings/site_settings/site_list.html
|
| index d4da8115386d0af27f562032206d2de2b84345cc..4772d79498bb6a7c3c839aa64417d5662b6561f9 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_list.html
|
| +++ b/chrome/browser/resources/settings/site_settings/site_list.html
|
| @@ -1,12 +1,12 @@
|
| <link rel="import" href="chrome://resources/cr_elements/icons.html">
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-dropdown/iron-dropdown.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
|
| <link rel="import" href="/i18n_setup.html">
|
| <link rel="import" href="/icons.html">
|
| <link rel="import" href="/route.html">
|
| +<link rel="import" href="/settings_action_menu.html">
|
| <link rel="import" href="/settings_shared_css.html">
|
| <link rel="import" href="/site_settings/add_site_dialog.html">
|
| <link rel="import" href="/site_settings/constants.html">
|
| @@ -37,6 +37,26 @@
|
| </paper-button>
|
| </div>
|
|
|
| + <dialog is="settings-action-menu">
|
| + <button class="dropdown-item" role="option" id="allow"
|
| + on-tap="onAllowTap_" hidden$="[[!showAllowAction_]]">
|
| + $i18n{siteSettingsActionAllow}
|
| + </button>
|
| + <button class="dropdown-item" role="option" id="block"
|
| + on-tap="onBlockTap_" hidden$="[[!showBlockAction_]]">
|
| + $i18n{siteSettingsActionBlock}
|
| + </button>
|
| + <button class="dropdown-item" role="option" id="sessionOnly"
|
| + on-tap="onSessionOnlyTap_"
|
| + hidden$="[[!showSessionOnlyActionForSite_(actionMenuSite_)]]">
|
| + $i18n{siteSettingsActionSessionOnly}
|
| + </button>
|
| + <button class="dropdown-item" role="option" id="reset"
|
| + on-tap="onResetTap_">
|
| + $i18n{siteSettingsActionReset}
|
| + </button>
|
| + </dialog>
|
| +
|
| <div class="list-frame menu-content vertical-list" id="listContainer">
|
| <template is="dom-repeat" items="[[sites]]">
|
| <div class="list-item">
|
| @@ -58,34 +78,10 @@
|
| <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon>
|
| </template>
|
|
|
| - <paper-icon-button id="dots" icon="cr:more-vert" toggles
|
| - active="{{item.menuOpened}}"
|
| - hidden="[[isExceptionControlled_(item.source)]]">
|
| + <paper-icon-button id="dots" icon="cr:more-vert"
|
| + hidden="[[isExceptionControlled_(item.source)]]"
|
| + on-tap="onShowActionMenuTap_">
|
| </paper-icon-button>
|
| - <template is="dom-if" if="[[item.menuOpened]]">
|
| - <iron-dropdown vertical-align="auto" horizontal-align="right"
|
| - opened="{{item.menuOpened}}">
|
| - <div class="dropdown-content">
|
| - <button class="dropdown-item" role="option" id="allow"
|
| - on-tap="onAllowTap_" hidden$="[[!showAllowAction_]]">
|
| - $i18n{siteSettingsActionAllow}
|
| - </button>
|
| - <button class="dropdown-item" role="option" id="block"
|
| - on-tap="onBlockTap_" hidden$="[[!showBlockAction_]]">
|
| - $i18n{siteSettingsActionBlock}
|
| - </button>
|
| - <button class="dropdown-item" role="option" id="sessionOnly"
|
| - on-tap="onSessionOnlyTap_"
|
| - hidden$="[[!showSessionOnlyActionForSite_(item)]]">
|
| - $i18n{siteSettingsActionSessionOnly}
|
| - </button>
|
| - <button class="dropdown-item" role="option" id="reset"
|
| - on-tap="onResetTap_">
|
| - $i18n{siteSettingsActionReset}
|
| - </button>
|
| - </div>
|
| - </iron-dropdown>
|
| - </template>
|
| <template is="dom-if" if="[[enableSiteSettings_]]">
|
| <div on-tap="onOriginTap_" actionable>
|
| <button class="subpage-arrow" is="paper-icon-button-light">
|
|
|