Commit 1cfccb95 authored by Tommy Li's avatar Tommy Li Committed by Commit Bot

[settings] Fix Search Engines dot menu visibility when policy applied

The dot menu was supposed to be invisible for enterprise policy
injected search engines.

This was regressed in this CL:
https://chromium-review.googlesource.com/c/chromium/src/+/564204/

This CL restores it and adds a test.

Bug: 1123909
Change-Id: Id38a2194764b3c1fa7ffc1bec9d4ef2c8d890037
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427290Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810843}
parent 9a5a70fc
...@@ -38,15 +38,15 @@ ...@@ -38,15 +38,15 @@
focus-type="cr-menu-button"></cr-icon-button> focus-type="cr-menu-button"></cr-icon-button>
<cr-action-menu role-description="$i18n{menu}"> <cr-action-menu role-description="$i18n{menu}">
<button class="dropdown-item" on-click="onMakeDefaultTap_" <button class="dropdown-item" on-click="onMakeDefaultTap_"
hidden$="[[!engine.canBeDefault]]" id="makeDefault"> disabled$="[[!engine.canBeDefault]]" id="makeDefault">
$i18n{searchEnginesMakeDefault} $i18n{searchEnginesMakeDefault}
</button> </button>
<button class="dropdown-item" on-click="onEditTap_" <button class="dropdown-item" on-click="onEditTap_"
hidden$="[[!engine.canBeEdited]]" id="edit"> disabled$="[[!engine.canBeEdited]]" id="edit">
$i18n{edit} $i18n{edit}
</button> </button>
<button class="dropdown-item" on-click="onDeleteTap_" <button class="dropdown-item" on-click="onDeleteTap_"
hidden$="[[!engine.canBeRemoved]]" id="delete"> disabled$="[[!engine.canBeRemoved]]" id="delete">
$i18n{searchEnginesRemoveFromList} $i18n{searchEnginesRemoveFromList}
</button> </button>
</cr-action-menu> </cr-action-menu>
......
...@@ -37,15 +37,6 @@ Polymer({ ...@@ -37,15 +37,6 @@ Polymer({
type: Boolean, type: Boolean,
computed: 'computeIsDefault_(engine)' computed: 'computeIsDefault_(engine)'
}, },
/** @private {boolean} */
showDots_: {
reflectToAttribute: true,
type: Boolean,
computed: 'computeShowDots_(engine.canBeDefault,' +
'engine.canBeEdited,' +
'engine.canBeRemoved)',
},
}, },
/** @private {SearchEnginesBrowserProxy} */ /** @private {SearchEnginesBrowserProxy} */
...@@ -69,17 +60,6 @@ Polymer({ ...@@ -69,17 +60,6 @@ Polymer({
return this.engine.default; return this.engine.default;
}, },
/**
* @param {boolean} canBeDefault
* @param {boolean} canBeEdited
* @param {boolean} canBeRemoved
* @return {boolean} Whether to show the dots menu.
* @private
*/
computeShowDots_(canBeDefault, canBeEdited, canBeRemoved) {
return canBeDefault || canBeEdited || canBeRemoved;
},
/** @private */ /** @private */
onDeleteTap_() { onDeleteTap_() {
this.browserProxy_.removeSearchEngine(this.engine.modelIndex); this.browserProxy_.removeSearchEngine(this.engine.modelIndex);
......
...@@ -253,8 +253,7 @@ suite('SearchEngineEntryTests', function() { ...@@ -253,8 +253,7 @@ suite('SearchEngineEntryTests', function() {
}); });
/** /**
* Checks that the given button is disabled (by being hidden), for the * Checks that the given button is disabled for the given search engine.
* given search engine.
* @param {!SearchEngine} searchEngine * @param {!SearchEngine} searchEngine
* @param {string} buttonId * @param {string} buttonId
*/ */
...@@ -262,7 +261,7 @@ suite('SearchEngineEntryTests', function() { ...@@ -262,7 +261,7 @@ suite('SearchEngineEntryTests', function() {
entry.engine = searchEngine; entry.engine = searchEngine;
const button = entry.$[buttonId]; const button = entry.$[buttonId];
assertTrue(!!button); assertTrue(!!button);
assertTrue(button.hidden); assertTrue(button.disabled);
} }
test('Remove_Disabled', function() { test('Remove_Disabled', function() {
...@@ -279,16 +278,6 @@ suite('SearchEngineEntryTests', function() { ...@@ -279,16 +278,6 @@ suite('SearchEngineEntryTests', function() {
testButtonDisabled( testButtonDisabled(
createSampleSearchEngine(0, 'G', true, false, true), 'edit'); createSampleSearchEngine(0, 'G', true, false, true), 'edit');
}); });
test('All_Disabled', function() {
entry.engine = createSampleSearchEngine(0, 'G', true, false, false);
flush();
assertTrue(entry.hasAttribute('show-dots_'));
entry.engine = createSampleSearchEngine(1, 'G', false, false, false);
flush();
assertFalse(entry.hasAttribute('show-dots_'));
});
}); });
suite('SearchEnginePageTests', function() { suite('SearchEnginePageTests', function() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment