Chromium Code Reviews| Index: chrome/browser/resources/settings/search_engines_page/search_engine_entry.html |
| diff --git a/chrome/browser/resources/settings/search_engines_page/search_engine_entry.html b/chrome/browser/resources/settings/search_engines_page/search_engine_entry.html |
| index 81130ec9cf383ca3ec5d125552bf3f969864d949..fc6c1420a72b2df4bf2dfcf7985fc62504bba598 100644 |
| --- a/chrome/browser/resources/settings/search_engines_page/search_engine_entry.html |
| +++ b/chrome/browser/resources/settings/search_engines_page/search_engine_entry.html |
| @@ -3,6 +3,7 @@ |
| <link rel="import" href="chrome://resources/html/polymer.html"> |
| <link rel="import" href="chrome://resources/html/icon.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> |
| +<link rel="import" href="/controls/extension_controlled_indicator.html"> |
| <link rel="import" href="/search_engines_page/search_engine_dialog.html"> |
| <link rel="import" href="/search_engines_page/search_engine_entry_css.html"> |
| <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html"> |
| @@ -11,7 +12,7 @@ |
| <dom-module id="settings-search-engine-entry"> |
| <template> |
| <style include="settings-shared search-engine-entry"> |
| - :host([is-default]) { |
| + :host([is-default]) .list-item { |
| font-weight: 500; |
| } |
| @@ -26,6 +27,11 @@ |
| text-overflow: ellipsis; |
| white-space: nowrap; |
| } |
| + |
| + :host(:not([show-dots_])) paper-icon-button { |
| + pointer-events: none; |
| + visibility: hidden; |
| + } |
| </style> |
| <template is="dom-if" if="[[showEditSearchEngineDialog_]]" restamp> |
| @@ -43,19 +49,28 @@ |
| <paper-icon-button icon="cr:more-vert" tabindex$="[[tabindex]]" |
| on-tap="onDotsTap_"> |
| </paper-icon-button> |
| - <dialog is="cr-action-menu"> |
| - <button class="dropdown-item" role="option" on-tap="onMakeDefaultTap_" |
| - hidden$="[[!engine.canBeDefault]]" id="makeDefault"> |
| - $i18n{searchEnginesMakeDefault} |
| - </button> |
| - <button class="dropdown-item" role="option" on-tap="onEditTap_" |
| - hidden$="[[!engine.canBeEdited]]" |
| - id="edit">$i18n{searchEnginesEdit}</button> |
| - <button class="dropdown-item" role="option" on-tap="onDeleteTap_" |
| - hidden$="[[!engine.canBeRemoved]]" |
| - id="delete">$i18n{searchEnginesRemoveFromList}</button> |
| - </dialog> |
| + <template is="dom-if" if="[[showDots_]]"> |
|
dpapad
2016/11/23 19:59:54
Perhaps add a test for this?
Dan Beam
2016/12/01 06:21:52
well, I removed the dom-if for a few reasons.
a)
|
| + <dialog is="cr-action-menu"> |
| + <button class="dropdown-item" role="option" on-tap="onMakeDefaultTap_" |
| + hidden$="[[!engine.canBeDefault]]" id="makeDefault"> |
| + $i18n{searchEnginesMakeDefault} |
| + </button> |
| + <button class="dropdown-item" role="option" on-tap="onEditTap_" |
| + hidden$="[[!engine.canBeEdited]]" |
| + id="edit">$i18n{searchEnginesEdit}</button> |
| + <button class="dropdown-item" role="option" on-tap="onDeleteTap_" |
| + hidden$="[[!engine.canBeRemoved]]" |
| + id="delete">$i18n{searchEnginesRemoveFromList}</button> |
| + </dialog> |
| + </template> |
| </div> |
| + <template is="dom-if" if="[[engine.extension]]"> |
| + <extension-controlled-indicator |
| + extension-id="[[engine.extension.id]]" |
| + extension-name="[[engine.extension.name]]" |
| + extension-can-be-disabled="[[engine.extension.canBeDisabled]]"> |
| + </extension-controlled-indicator> |
| + </template> |
| </template> |
| <script src="search_engine_entry.js"></script> |
| </dom-module> |