WebUI: Remove remaining uses of iron-collapse on Desktop
Also removing the following from Desktop builds:
iron-collapse/iron-collapse.js
iron-fit-behavior/iron-fit-behavior.js
iron-range-behavior/iron-range-behavior.js
since they are no longer used anywhere.
Bug: 40943652
Change-Id: I275c179a20f8a2e2f4a8382d50340f25ae9d32de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5623493
Reviewed-by: Kevin Graney <kmg@google.com>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1315221}
diff --git a/chrome/browser/privacy_sandbox/browsing_topics_settings_interactive_uitest.cc b/chrome/browser/privacy_sandbox/browsing_topics_settings_interactive_uitest.cc
index b3545fb..90bf1f7 100644
--- a/chrome/browser/privacy_sandbox/browsing_topics_settings_interactive_uitest.cc
+++ b/chrome/browser/privacy_sandbox/browsing_topics_settings_interactive_uitest.cc
@@ -94,7 +94,7 @@
(blockedTopicsList + "privacy-sandbox-interest-item") + "cr-button";
const DeepQuery blockedTopicsRow =
GetAdTopicsPageQuery() + "#blockedTopicsRow";
- const DeepQuery ironCollapse = GetAdTopicsPageQuery() + "iron-collapse";
+ const DeepQuery ironCollapse = GetAdTopicsPageQuery() + "cr-collapse";
private:
base::test::ScopedFeatureList scoped_feature_list_;
diff --git a/chrome/browser/resources/settings/lazy_load.ts b/chrome/browser/resources/settings/lazy_load.ts
index 18a5f17..13d6327 100644
--- a/chrome/browser/resources/settings/lazy_load.ts
+++ b/chrome/browser/resources/settings/lazy_load.ts
@@ -89,6 +89,7 @@
export {FontsBrowserProxy, FontsBrowserProxyImpl, FontsData} from '/shared/settings/appearance_page/fonts_browser_proxy.js';
export {CrCheckboxElement} from 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.js';
+export {CrCollapseElement} from 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
export {CrDialogElement} from 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js';
export {CrExpandButtonElement} from 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
export {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js';
@@ -98,7 +99,6 @@
export {CrTextareaElement} from 'chrome://resources/cr_elements/cr_textarea/cr_textarea.js';
export {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js';
export {CrTooltipElement} from 'chrome://resources/cr_elements/cr_tooltip/cr_tooltip.js';
-export {IronCollapseElement} from 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
export {IronListElement} from 'chrome://resources/polymer/v3_0/iron-list/iron-list.js';
export {AccessibilityBrowserProxy, AccessibilityBrowserProxyImpl} from './a11y_page/a11y_browser_proxy.js';
export {ControlledButtonElement} from './controls/controlled_button.js';
diff --git a/chrome/browser/resources/settings/privacy_page/collapse_radio_button.html b/chrome/browser/resources/settings/privacy_page/collapse_radio_button.html
index 9ef7a50..943d39f7 100644
--- a/chrome/browser/resources/settings/privacy_page/collapse_radio_button.html
+++ b/chrome/browser/resources/settings/privacy_page/collapse_radio_button.html
@@ -16,7 +16,7 @@
opacity: var(--cr-disabled-opacity);
}
- iron-collapse {
+ cr-collapse {
margin-inline-end: 0;
margin-inline-start: calc(var(--cr-radio-button-label-spacing, 20px)
+ var(--cr-radio-button-size));
@@ -99,7 +99,7 @@
</div>
</div>
- <iron-collapse opened="[[expanded]]">
+ <cr-collapse opened="[[expanded]]">
<slot name="collapse"></slot>
<slot name="noSelectionCollapse"></slot>
- </iron-collapse>
+ </cr-collapse>
diff --git a/chrome/browser/resources/settings/privacy_page/collapse_radio_button.ts b/chrome/browser/resources/settings/privacy_page/collapse_radio_button.ts
index 76333ca..accb6aa 100644
--- a/chrome/browser/resources/settings/privacy_page/collapse_radio_button.ts
+++ b/chrome/browser/resources/settings/privacy_page/collapse_radio_button.ts
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
import 'chrome://resources/cr_elements/cr_radio_button/cr_radio_button_style.css.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
import '../settings_shared.css.js';
diff --git a/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_fledge_subpage.html b/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_fledge_subpage.html
index f9e0409b..029f9131 100644
--- a/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_fledge_subpage.html
+++ b/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_fledge_subpage.html
@@ -119,7 +119,7 @@
expanded="{{seeAllSitesExpanded_}}">
$i18n{fledgePageSeeAllSitesLabel}
</cr-expand-button>
- <iron-collapse opened="[[seeAllSitesExpanded_]]">
+ <cr-collapse opened="[[seeAllSitesExpanded_]]">
<div role="region"
aria-label="$i18n{fledgePageCurrentSitesRegionA11yDescription}">
<template is="dom-repeat" items="[[remainingSitesList_]]">
@@ -128,7 +128,7 @@
</privacy-sandbox-interest-item>
</template>
</div>
- </iron-collapse>
+ </cr-collapse>
</template>
<div id="currentSitesDescriptionEmpty"
class="no-sites cr-secondary-text"
@@ -148,7 +148,7 @@
expanded="{{blockedSitesExpanded_}}">
$i18n{fledgePageBlockedSitesHeading}
</cr-expand-button>
-<iron-collapse opened="[[blockedSitesExpanded_]]">
+<cr-collapse opened="[[blockedSitesExpanded_]]">
<div id="blockedSitesDescription"
class$="[[getBlockedSitesDescriptionClass_(blockedSitesList_.length)]]">
[[computeBlockedSitesDescription_(blockedSitesList_.length)]]
@@ -161,7 +161,7 @@
</privacy-sandbox-interest-item>
</template>
</div>
-</iron-collapse>
+</cr-collapse>
<div id="footer" class="cr-secondary-text hr footer"
hidden="[[shouldShowV2_]]">
$i18nRaw{fledgePageFooter}
diff --git a/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_fledge_subpage.ts b/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_fledge_subpage.ts
index 534d38f..eaf0909 100644
--- a/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_fledge_subpage.ts
+++ b/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_fledge_subpage.ts
@@ -4,10 +4,10 @@
import '/shared/settings/prefs/prefs.js';
import 'chrome://resources/cr_elements/cr_button/cr_button.js';
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js';
import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import '../controls/settings_toggle_button.js';
import './privacy_sandbox_interest_item.js';
diff --git a/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_topics_subpage.html b/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_topics_subpage.html
index fb0ae70..774b482 100644
--- a/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_topics_subpage.html
+++ b/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_topics_subpage.html
@@ -168,7 +168,7 @@
$i18n{topicsPageBlockedTopicsDescriptionNew}
</div>
</cr-expand-button>
- <iron-collapse opened="[[blockedTopicsExpanded_]]">
+ <cr-collapse opened="[[blockedTopicsExpanded_]]">
<div id="blockedTopicsDescription"
class$="[[getBlockedTopicsDescriptionClass_(
blockedTopicsList_.length)]]"
@@ -195,7 +195,7 @@
</privacy-sandbox-interest-item>
</template>
</div>
- </iron-collapse>
+ </cr-collapse>
<template is="dom-if" if="[[shouldShowV2_]]">
<div id="manageTopicsSection" class="hr">
<cr-link-row id="privacySandboxManageTopicsLinkRow"
diff --git a/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_topics_subpage.ts b/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_topics_subpage.ts
index 1e6b370..1b66620 100644
--- a/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_topics_subpage.ts
+++ b/chrome/browser/resources/settings/privacy_sandbox/privacy_sandbox_topics_subpage.ts
@@ -4,11 +4,11 @@
import '/shared/settings/prefs/prefs.js';
import 'chrome://resources/cr_elements/cr_button/cr_button.js';
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js';
import 'chrome://resources/cr_elements/cr_toast/cr_toast.js';
import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import '../controls/settings_toggle_button.js';
import './privacy_sandbox_interest_item.js';
diff --git a/chrome/browser/resources/settings/safety_check_page/safety_check_page.html b/chrome/browser/resources/settings/safety_check_page/safety_check_page.html
index 7e4f1238..7798f49 100644
--- a/chrome/browser/resources/settings/safety_check_page/safety_check_page.html
+++ b/chrome/browser/resources/settings/safety_check_page/safety_check_page.html
@@ -33,7 +33,7 @@
</cr-icon-button>
</template>
</div>
- <iron-collapse id="safetyCheckCollapse"
+ <cr-collapse id="safetyCheckCollapse"
opened="[[shouldShowChildren_(parentStatus_)]]">
<settings-safety-check-updates-child>
</settings-safety-check-updates-child>
@@ -46,7 +46,7 @@
<settings-safety-check-extensions-child>
</settings-safety-check-extensions-child>
</template>
- </iron-collapse>
+ </cr-collapse>
<template is="dom-if" if="[[shouldShowSafetyCheckExtensionsReview_(
safetyCheckNumberOfExtensionsThatNeedReview_)]]" restamp>
<safety-check-extensions>
diff --git a/chrome/browser/resources/settings/safety_check_page/safety_check_page.ts b/chrome/browser/resources/settings/safety_check_page/safety_check_page.ts
index 8329aaa..bca1c79 100644
--- a/chrome/browser/resources/settings/safety_check_page/safety_check_page.ts
+++ b/chrome/browser/resources/settings/safety_check_page/safety_check_page.ts
@@ -9,10 +9,10 @@
*/
import 'chrome://resources/cr_elements/cr_button/cr_button.js';
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
import '../settings_shared.css.js';
diff --git a/chrome/browser/resources/settings/search_engines_page/search_engines_list.html b/chrome/browser/resources/settings/search_engines_page/search_engines_list.html
index 9b42514..1213110 100644
--- a/chrome/browser/resources/settings/search_engines_page/search_engines_list.html
+++ b/chrome/browser/resources/settings/search_engines_page/search_engines_list.html
@@ -106,7 +106,7 @@
expanded="{{enginesListExpanded_}}">
<div>[[expandListText]]</div>
</cr-expand-button>
- <iron-collapse opened="[[enginesListExpanded_]]">
+ <cr-collapse opened="[[enginesListExpanded_]]">
<div role="rowgroup">
<dom-repeat items="[[collapsedEngines]]">
<template>
@@ -117,7 +117,7 @@
</template>
</dom-repeat>
</div>
- </iron-collapse>
+ </cr-collapse>
</div>
</template>
</div>
diff --git a/chrome/browser/resources/settings/search_engines_page/search_engines_list.ts b/chrome/browser/resources/settings/search_engines_page/search_engines_list.ts
index df46647..b09c60f 100644
--- a/chrome/browser/resources/settings/search_engines_page/search_engines_list.ts
+++ b/chrome/browser/resources/settings/search_engines_page/search_engines_list.ts
@@ -7,6 +7,7 @@
* list of search engines.
*/
import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import '../settings_shared.css.js';
import '../settings_vars.css.js';
import './search_engine_entry.js';
diff --git a/chrome/browser/resources/settings/site_settings/file_system_site_entry.ts b/chrome/browser/resources/settings/site_settings/file_system_site_entry.ts
index a76e762..3c54d08 100644
--- a/chrome/browser/resources/settings/site_settings/file_system_site_entry.ts
+++ b/chrome/browser/resources/settings/site_settings/file_system_site_entry.ts
@@ -10,7 +10,6 @@
import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import './file_system_site_entry_item.js';
import '../settings_shared.css.js';
import '../site_favicon.js';
diff --git a/chrome/browser/resources/settings/site_settings/review_notification_permissions.html b/chrome/browser/resources/settings/site_settings/review_notification_permissions.html
index 678b1bf..2d49dfb 100644
--- a/chrome/browser/resources/settings/site_settings/review_notification_permissions.html
+++ b/chrome/browser/resources/settings/site_settings/review_notification_permissions.html
@@ -13,7 +13,7 @@
expanded="{{notificationPermissionReviewListExpanded_}}">
</cr-expand-button>
</div>
- <iron-collapse class="site-list"
+ <cr-collapse class="site-list"
opened="[[notificationPermissionReviewListExpanded_]]">
<template is="dom-repeat" items="[[sites_]]">
<div class="list-item site-entry">
@@ -41,7 +41,7 @@
$i18n{safetyCheckNotificationPermissionReviewBlockAllLabel}
</cr-button>
</div>
- </iron-collapse>
+ </cr-collapse>
<cr-tooltip fit-to-visible-bounds manual-mode position="top" offset="3">
$i18n{safetyCheckNotificationPermissionReviewDontAllowLabel}
</cr-tooltip>
diff --git a/chrome/browser/resources/settings/site_settings/review_notification_permissions.ts b/chrome/browser/resources/settings/site_settings/review_notification_permissions.ts
index a0e89a4a..bec1116 100644
--- a/chrome/browser/resources/settings/site_settings/review_notification_permissions.ts
+++ b/chrome/browser/resources/settings/site_settings/review_notification_permissions.ts
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js';
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
import 'chrome://resources/cr_elements/cr_toast/cr_toast.js';
diff --git a/chrome/browser/resources/settings/site_settings/site_entry.html b/chrome/browser/resources/settings/site_settings/site_entry.html
index 3c7d1d3..98173ffa 100644
--- a/chrome/browser/resources/settings/site_settings/site_entry.html
+++ b/chrome/browser/resources/settings/site_settings/site_entry.html
@@ -120,7 +120,7 @@
<cr-lazy-render id="originList">
<template>
- <iron-collapse id="collapseChild" no-animation>
+ <cr-collapse id="collapseChild" no-animation>
<div class="list-frame">
<template is="dom-repeat" items="[[siteGroup.origins]]">
<div class="list-item hr">
@@ -184,7 +184,7 @@
</div>
</template>
</div>
- </iron-collapse>
+ </cr-collapse>
</template>
</cr-lazy-render>
</div>
diff --git a/chrome/browser/resources/settings/site_settings/site_entry.ts b/chrome/browser/resources/settings/site_settings/site_entry.ts
index 5f050b4..7bab59217a 100644
--- a/chrome/browser/resources/settings/site_settings/site_entry.ts
+++ b/chrome/browser/resources/settings/site_settings/site_entry.ts
@@ -7,20 +7,20 @@
* 'site-entry' is an element representing a single eTLD+1 site entity.
*/
import 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js';
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js';
import 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import '../settings_shared.css.js';
import '../site_favicon.js';
+import type {CrCollapseElement} from 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import type {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js';
import type {CrLazyRenderElement} from 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js';
import {FocusRowMixin} from 'chrome://resources/cr_elements/focus_row_mixin.js';
import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
import {assert, assertNotReached} from 'chrome://resources/js/assert.js';
import {EventTracker} from 'chrome://resources/js/event_tracker.js';
-import type {IronCollapseElement} from 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import type {DomRepeatEvent} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {afterNextRender, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
@@ -42,7 +42,7 @@
cookies: HTMLElement,
fpsMembership: HTMLElement,
displayName: HTMLElement,
- originList: CrLazyRenderElement<IronCollapseElement>,
+ originList: CrLazyRenderElement<CrCollapseElement>,
toggleButton: HTMLElement,
extensionIdDescription: HTMLElement,
};
diff --git a/chrome/browser/resources/settings/site_settings/storage_access_site_list_entry.ts b/chrome/browser/resources/settings/site_settings/storage_access_site_list_entry.ts
index e75b529..260aa22 100644
--- a/chrome/browser/resources/settings/site_settings/storage_access_site_list_entry.ts
+++ b/chrome/browser/resources/settings/site_settings/storage_access_site_list_entry.ts
@@ -12,7 +12,6 @@
import 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import '../settings_shared.css.js';
import '../site_favicon.js';
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
index eb01ae0..ac69ec7 100644
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
@@ -64,12 +64,12 @@
expanded="{{permissionsExpanded_}}">
<div>$i18n{siteSettingsPermissionsMore}</div>
</cr-expand-button>
- <iron-collapse opened="[[permissionsExpanded_]]">
+ <cr-collapse opened="[[permissionsExpanded_]]">
<settings-site-settings-list id="advancedPermissionsList"
category-list="[[lists_.permissionsAdvanced]]"
focus-config="[[focusConfig]]">
</settings-site-settings-list>
- </iron-collapse>
+ </cr-collapse>
<div class="cr-row first line-only">
<h2>$i18n{siteSettingsContent}</h2>
@@ -82,12 +82,12 @@
expanded="{{contentExpanded_}}">
<div>$i18n{siteSettingsContentMore}</div>
</cr-expand-button>
- <iron-collapse opened="[[contentExpanded_]]">
+ <cr-collapse opened="[[contentExpanded_]]">
<settings-site-settings-list id="advancedContentList" prefs="{{prefs}}"
category-list="[[lists_.contentAdvanced]]"
focus-config="[[focusConfig]]">
</settings-site-settings-list>
- </iron-collapse>
+ </cr-collapse>
<template is="dom-if" if="[[enableSafetyHub_]]">
<settings-toggle-button
id="unusedSitePermissionsRevocationToggle"
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
index b721e38..2d902fe 100644
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -9,10 +9,10 @@
*/
import 'chrome://resources/cr_elements/icons.html.js';
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
import 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import '../controls/settings_toggle_button.js';
import '../settings_shared.css.js';
import './recent_site_permissions.js';
diff --git a/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.html b/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.html
index aaebfe0..20f5cc7 100644
--- a/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.html
+++ b/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.html
@@ -14,7 +14,7 @@
<div class="secondary">[[subtitleString_]]</div>
</cr-expand-button>
</div>
- <iron-collapse class="site-list"
+ <cr-collapse class="site-list"
opened="[[unusedSitePermissionsReviewListExpanded_]]">
<template is="dom-repeat" items="[[sites_]]">
<div class$="list-item site-entry [[getRowClass_(item.visible)]]">
@@ -36,7 +36,7 @@
$i18n{safetyCheckUnusedSitePermissionsGotItLabel}
</cr-button>
</div>
- </iron-collapse>
+ </cr-collapse>
<cr-tooltip fit-to-visible-bounds manual-mode position="top" offset="3">
$i18n{safetyCheckUnusedSitePermissionsAllowAgainLabel}
</cr-tooltip>
diff --git a/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.ts b/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.ts
index 5904a67d..ba290f57 100644
--- a/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.ts
+++ b/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.ts
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'chrome://resources/cr_elements/cr_button/cr_button.js';
+import 'chrome://resources/cr_elements/cr_collapse/cr_collapse.js';
import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
import 'chrome://resources/cr_elements/cr_toast/cr_toast.js';
import 'chrome://resources/cr_elements/cr_tooltip/cr_tooltip.js';
import 'chrome://resources/cr_elements/policy/cr_tooltip_icon.js';
-import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
import '../settings_shared.css.js';
import '../site_favicon.js';
diff --git a/chrome/test/data/webui/settings/battery_page_test.ts b/chrome/test/data/webui/settings/battery_page_test.ts
index e8beab8..d35204d 100644
--- a/chrome/test/data/webui/settings/battery_page_test.ts
+++ b/chrome/test/data/webui/settings/battery_page_test.ts
@@ -6,7 +6,7 @@
import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import type {IronCollapseElement, SettingsRadioGroupElement} from 'chrome://settings/lazy_load.js';
+import type {CrCollapseElement, SettingsRadioGroupElement} from 'chrome://settings/lazy_load.js';
import type {ControlledRadioButtonElement, SettingsBatteryPageElement, SettingsToggleButtonElement} from 'chrome://settings/settings.js';
import {BATTERY_SAVER_MODE_PREF, BatterySaverModeState, PerformanceBrowserProxyImpl, PerformanceMetricsProxyImpl} from 'chrome://settings/settings.js';
import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js';
@@ -56,7 +56,7 @@
'battery');
assertTrue(
batteryPage.shadowRoot!
- .querySelector<IronCollapseElement>('#radioGroupCollapse')!.opened,
+ .querySelector<CrCollapseElement>('#radioGroupCollapse')!.opened,
'collapse should be open when battery saver mode is enabled on ' +
'battery');
assertEquals(
@@ -78,7 +78,7 @@
'threshold');
assertTrue(
batteryPage.shadowRoot!
- .querySelector<IronCollapseElement>('#radioGroupCollapse')!.opened,
+ .querySelector<CrCollapseElement>('#radioGroupCollapse')!.opened,
'collapse should be open when battery saver mode is enabled below ' +
'threshold');
assertEquals(
@@ -98,7 +98,7 @@
'toggle should be unchecked when battery saver mode is disabled');
assertFalse(
batteryPage.shadowRoot!
- .querySelector<IronCollapseElement>('#radioGroupCollapse')!.opened,
+ .querySelector<CrCollapseElement>('#radioGroupCollapse')!.opened,
'collapse should be closed when battery saver mode is disabled');
});
diff --git a/chrome/test/data/webui/settings/collapse_radio_button_test.ts b/chrome/test/data/webui/settings/collapse_radio_button_test.ts
index b342319e..1b05ec8 100644
--- a/chrome/test/data/webui/settings/collapse_radio_button_test.ts
+++ b/chrome/test/data/webui/settings/collapse_radio_button_test.ts
@@ -25,7 +25,7 @@
test('openOnSelection', function() {
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
collapseRadioButton.checked = false;
flush();
assertFalse(collapse.opened);
@@ -36,7 +36,7 @@
test('closeOnDeselect', function() {
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
collapseRadioButton.checked = true;
flush();
assertTrue(collapse.opened);
@@ -48,7 +48,7 @@
// Button should remain closed when noAutomaticCollapse flag is set.
test('closedWhenInitiallyClosedAndNoAutomaticCollapse', function() {
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
collapseRadioButton.checked = false;
flush();
assertFalse(collapse.opened);
@@ -66,7 +66,7 @@
// Button should remain opened when noAutomaticCollapse flag is set.
test('openedWhenInitiallyOpenedAndNoAutomaticCollapse', function() {
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
collapseRadioButton.checked = true;
flush();
assertTrue(collapse.opened);
@@ -85,7 +85,7 @@
// open the iron collapse.
test('openOnExpandHit', async function() {
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
collapseRadioButton.checked = false;
flush();
assertFalse(collapse.opened);
@@ -98,7 +98,7 @@
// the iron collapse.
test('closeOnExpandHitWhenSelected', async function() {
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
collapseRadioButton.checked = true;
flush();
assertTrue(collapse.opened);
@@ -111,7 +111,7 @@
// the radio button immediately.
test('openOnExpandHitWhenNoAutomaticCollapse', async function() {
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
collapseRadioButton.checked = false;
flush();
assertFalse(collapse.opened);
@@ -129,7 +129,7 @@
// the radio button immediately.
test('closeOnExpandHitWhenSelectedWhenNoAutomaticCollapse', async function() {
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
collapseRadioButton.checked = true;
flush();
assertTrue(collapse.opened);
@@ -157,7 +157,7 @@
collapseRadioButton.checked = false;
collapseRadioButton.disabled = true;
const collapse =
- collapseRadioButton.shadowRoot!.querySelector('iron-collapse')!;
+ collapseRadioButton.shadowRoot!.querySelector('cr-collapse')!;
flush();
assertFalse(collapse.opened);
diff --git a/chrome/test/data/webui/settings/get_most_chrome_page_test.ts b/chrome/test/data/webui/settings/get_most_chrome_page_test.ts
index 87bfc73..403d6e8 100644
--- a/chrome/test/data/webui/settings/get_most_chrome_page_test.ts
+++ b/chrome/test/data/webui/settings/get_most_chrome_page_test.ts
@@ -5,7 +5,7 @@
import 'chrome://settings/lazy_load.js';
import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import type {CrExpandButtonElement, IronCollapseElement, SettingsGetMostChromePageElement} from 'chrome://settings/lazy_load.js';
+import type {CrCollapseElement, CrExpandButtonElement, SettingsGetMostChromePageElement} from 'chrome://settings/lazy_load.js';
import {GetTheMostOutOfChromeUserAction} from 'chrome://settings/lazy_load.js';
import type {SettingsRoutes} from 'chrome://settings/settings.js';
import {HatsBrowserProxyImpl, loadTimeData, MetricsBrowserProxyImpl, resetRouterForTesting, Router, TrustSafetyInteraction} from 'chrome://settings/settings.js';
@@ -59,20 +59,19 @@
const crExpandButton =
testElement.shadowRoot!.querySelector<CrExpandButtonElement>(row.id);
assertTrue(!!crExpandButton);
- const ironCollapse =
- crExpandButton.nextElementSibling as IronCollapseElement;
- assertTrue(!!ironCollapse);
+ const crCollapse = crExpandButton.nextElementSibling as CrCollapseElement;
+ assertTrue(!!crCollapse);
metricsBrowserProxy.reset();
- assertFalse(ironCollapse.opened);
+ assertFalse(crCollapse.opened);
crExpandButton.click();
const userAction = await metricsBrowserProxy.whenCalled('recordAction');
assertEquals(row.action, userAction);
await crExpandButton.updateComplete;
- assertTrue(ironCollapse.opened);
+ assertTrue(crCollapse.opened);
}
});
diff --git a/chrome/test/data/webui/settings/people_page_sync_page_test.ts b/chrome/test/data/webui/settings/people_page_sync_page_test.ts
index 576220b..5252f73 100644
--- a/chrome/test/data/webui/settings/people_page_sync_page_test.ts
+++ b/chrome/test/data/webui/settings/people_page_sync_page_test.ts
@@ -12,7 +12,7 @@
// <if expr="not chromeos_ash">
import type {CrDialogElement} from 'chrome://settings/lazy_load.js';
// </if>
-import type {IronCollapseElement} from 'chrome://settings/lazy_load.js';
+import type {CrCollapseElement} from 'chrome://settings/lazy_load.js';
import type {CrButtonElement, CrRadioButtonElement, CrRadioGroupElement} from 'chrome://settings/settings.js';
import {MetricsBrowserProxyImpl} from 'chrome://settings/settings.js';
import {OpenWindowProxyImpl, PageStatus, Router, routes, SignedInState, StatusAction, SyncBrowserProxyImpl} from 'chrome://settings/settings.js';
@@ -1041,7 +1041,7 @@
test('personalizationCollapse', async function() {
// The collapse is collapsed by default.
const personalizationCollapse =
- syncPage.shadowRoot!.querySelector<IronCollapseElement>(
+ syncPage.shadowRoot!.querySelector<CrCollapseElement>(
'#personalizationCollapse');
assertTrue(!!personalizationCollapse);
assertFalse(personalizationCollapse.opened);
diff --git a/chrome/test/data/webui/settings/performance_page_test.ts b/chrome/test/data/webui/settings/performance_page_test.ts
index 4463a24..a9b8a15 100644
--- a/chrome/test/data/webui/settings/performance_page_test.ts
+++ b/chrome/test/data/webui/settings/performance_page_test.ts
@@ -6,7 +6,7 @@
import 'chrome://settings/settings.js';
import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import type {CrIconButtonElement, IronCollapseElement, SettingsRadioGroupElement} from 'chrome://settings/lazy_load.js';
+import type {CrCollapseElement, CrIconButtonElement, SettingsRadioGroupElement} from 'chrome://settings/lazy_load.js';
import type {ExceptionEditDialogElement, ExceptionEntryElement, ExceptionListElement, ExceptionTabbedAddDialogElement, SettingsCheckboxListEntryElement, SettingsPerformancePageElement, SettingsToggleButtonElement} from 'chrome://settings/settings.js';
import {convertDateToWindowsEpoch, DISCARD_RING_PREF, MEMORY_SAVER_MODE_AGGRESSIVENESS_PREF, MEMORY_SAVER_MODE_PREF, MemorySaverModeAggressiveness, MemorySaverModeExceptionListAction, MemorySaverModeState, PerformanceBrowserProxyImpl, PerformanceMetricsProxyImpl, TAB_DISCARD_EXCEPTIONS_MANAGED_PREF, TAB_DISCARD_EXCEPTIONS_OVERFLOW_SIZE, TAB_DISCARD_EXCEPTIONS_PREF} from 'chrome://settings/settings.js';
import {assertDeepEquals, assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js';
@@ -122,7 +122,7 @@
let mediumButton: HTMLElement;
let aggressiveButton: HTMLElement;
let radioGroup: SettingsRadioGroupElement;
- let radioGroupCollapse: IronCollapseElement;
+ let radioGroupCollapse: CrCollapseElement;
let discardRingTreatmentToggleButton: SettingsToggleButtonElement;
/**
diff --git a/chrome/test/data/webui/settings/review_notification_permissions_test.ts b/chrome/test/data/webui/settings/review_notification_permissions_test.ts
index 79ffe248..264b77f4 100644
--- a/chrome/test/data/webui/settings/review_notification_permissions_test.ts
+++ b/chrome/test/data/webui/settings/review_notification_permissions_test.ts
@@ -462,7 +462,7 @@
assertTrue(!!expandButton);
const notificationPermissionList =
- testElement.shadowRoot!.querySelector('iron-collapse');
+ testElement.shadowRoot!.querySelector('cr-collapse');
assertTrue(!!notificationPermissionList);
// Button and list start out expanded.
diff --git a/chrome/test/data/webui/settings/safety_check_page_test.ts b/chrome/test/data/webui/settings/safety_check_page_test.ts
index 340a066..aed8cec 100644
--- a/chrome/test/data/webui/settings/safety_check_page_test.ts
+++ b/chrome/test/data/webui/settings/safety_check_page_test.ts
@@ -135,7 +135,7 @@
assertTrue(!!page.shadowRoot!.querySelector('#safetyCheckParentButton'));
assertFalse(!!page.shadowRoot!.querySelector('cr-icon-button'));
// Collapse is not opened.
- const collapse = page.shadowRoot!.querySelector('iron-collapse')!;
+ const collapse = page.shadowRoot!.querySelector('cr-collapse')!;
assertFalse(collapse.opened);
// User starts check.
@@ -180,7 +180,7 @@
assertFalse(!!page.shadowRoot!.querySelector('#safetyCheckParentButton'));
assertTrue(!!page.shadowRoot!.querySelector('cr-icon-button'));
// Collapse is opened.
- assertTrue(page.shadowRoot!.querySelector('iron-collapse')!.opened);
+ assertTrue(page.shadowRoot!.querySelector('cr-collapse')!.opened);
// Ensure the automatic browser proxy calls are started.
return safetyCheckBrowserProxy.whenCalled('getParentRanDisplayString');
diff --git a/chrome/test/data/webui/settings/site_entry_test.ts b/chrome/test/data/webui/settings/site_entry_test.ts
index f9119dd..f2beaea 100644
--- a/chrome/test/data/webui/settings/site_entry_test.ts
+++ b/chrome/test/data/webui/settings/site_entry_test.ts
@@ -10,7 +10,7 @@
import {SiteSettingsPrefsBrowserProxyImpl, SortMethod} from 'chrome://settings/lazy_load.js';
import {Router, routes} from 'chrome://settings/settings.js';
import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js';
-import {eventToPromise, isChildVisible} from 'chrome://webui-test/test_util.js';
+import {eventToPromise, microtasksFinished, isChildVisible} from 'chrome://webui-test/test_util.js';
import {TestSiteSettingsPrefsBrowserProxy} from './test_site_settings_prefs_browser_proxy.js';
import {createOriginInfo, createSiteGroup} from './test_util.js';
@@ -69,7 +69,7 @@
assertEquals(3, collapseChild.querySelectorAll('.origin-link').length);
});
- test('expands and closes to show more origins', function() {
+ test('expands and closes to show more origins', async () => {
testElement.siteGroup = TEST_MULTIPLE_SITE_GROUP;
assertFalse(testElement.$.expandIcon.hidden);
assertEquals(
@@ -77,15 +77,16 @@
assertEquals(
'false', testElement.$.expandIcon.getAttribute('aria-expanded'));
const originList = testElement.$.originList.get();
- assertTrue(originList.classList.contains('iron-collapse-closed'));
+ assertTrue(originList.classList.contains('collapse-closed'));
assertEquals('true', originList.getAttribute('aria-hidden'));
testElement.$.toggleButton.click();
+ await microtasksFinished();
assertEquals(
'true', testElement.$.toggleButton.getAttribute('aria-expanded'));
assertEquals(
'true', testElement.$.expandIcon.getAttribute('aria-expanded'));
- assertTrue(originList.classList.contains('iron-collapse-opened'));
+ assertTrue(originList.classList.contains('collapse-opened'));
assertEquals('false', originList.getAttribute('aria-hidden'));
});
@@ -95,13 +96,13 @@
assertEquals(
'false', testElement.$.toggleButton.getAttribute('aria-expanded'));
const originList = testElement.$.originList.get();
- assertTrue(originList.classList.contains('iron-collapse-closed'));
+ assertTrue(originList.classList.contains('collapse-closed'));
assertEquals('true', originList.getAttribute('aria-hidden'));
testElement.$.toggleButton.click();
assertEquals(
'false', testElement.$.toggleButton.getAttribute('aria-expanded'));
- assertTrue(originList.classList.contains('iron-collapse-closed'));
+ assertTrue(originList.classList.contains('collapse-closed'));
assertEquals('true', originList.getAttribute('aria-hidden'));
assertEquals(
routes.SITE_SETTINGS_SITE_DETAILS.path,
@@ -441,6 +442,7 @@
flush();
const collapseChild = testElement.$.originList.get();
testElement.$.toggleButton.click();
+ await microtasksFinished();
flush();
const originList = collapseChild.querySelectorAll('.hr');
diff --git a/chrome/test/data/webui/settings/unused_site_permissions_test.ts b/chrome/test/data/webui/settings/unused_site_permissions_test.ts
index 00fccb38..2c0e2906 100644
--- a/chrome/test/data/webui/settings/unused_site_permissions_test.ts
+++ b/chrome/test/data/webui/settings/unused_site_permissions_test.ts
@@ -179,7 +179,7 @@
assertTrue(!!expandButton);
const unusedSitePermissionList =
- testElement.shadowRoot!.querySelector('iron-collapse');
+ testElement.shadowRoot!.querySelector('cr-collapse');
assertTrue(!!unusedSitePermissionList);
// Button and list start out expanded.
diff --git a/third_party/polymer/v3_0/BUILD.gn b/third_party/polymer/v3_0/BUILD.gn
index 195cbf8..dcfab520 100644
--- a/third_party/polymer/v3_0/BUILD.gn
+++ b/third_party/polymer/v3_0/BUILD.gn
@@ -14,8 +14,6 @@
js_files = [
"iron-a11y-keys-behavior/iron-a11y-keys-behavior.js",
"iron-a11y-keys/iron-a11y-keys.js",
- "iron-collapse/iron-collapse.js",
- "iron-fit-behavior/iron-fit-behavior.js",
"iron-flex-layout/iron-flex-layout-classes.js",
"iron-icon/iron-icon.js",
"iron-iconset-svg/iron-iconset-svg.js",
@@ -23,7 +21,6 @@
"iron-media-query/iron-media-query.js",
"iron-meta/iron-meta.js",
"iron-pages/iron-pages.js",
- "iron-range-behavior/iron-range-behavior.js",
"iron-resizable-behavior/iron-resizable-behavior.js",
"iron-scroll-target-behavior/iron-scroll-target-behavior.js",
"iron-scroll-threshold/iron-scroll-threshold.js",
@@ -43,8 +40,10 @@
js_files += [
"iron-a11y-announcer/iron-a11y-announcer.js",
"iron-behaviors/iron-control-state.js",
+ "iron-collapse/iron-collapse.js",
"iron-dropdown/iron-dropdown.js",
"iron-dropdown/iron-dropdown-scroll-manager.js",
+ "iron-fit-behavior/iron-fit-behavior.js",
"iron-location/iron-location.js",
"iron-location/iron-query-params.js",
"iron-overlay-behavior/iron-focusables-helper.js",
@@ -52,6 +51,7 @@
"iron-overlay-behavior/iron-overlay-behavior.js",
"iron-overlay-behavior/iron-overlay-manager.js",
"iron-overlay-behavior/iron-scroll-manager.js",
+ "iron-range-behavior/iron-range-behavior.js",
"neon-animation/animations/fade-in-animation.js",
"neon-animation/animations/fade-out-animation.js",
"neon-animation/neon-animatable-behavior.js",
@@ -196,9 +196,7 @@
definitions = [
"components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior.d.ts",
"components-chromium/iron-a11y-keys/iron-a11y-keys.d.ts",
- "components-chromium/iron-collapse/iron-collapse.d.ts",
"components-chromium/iron-behaviors/iron-control-state.d.ts",
- "components-chromium/iron-fit-behavior/iron-fit-behavior.d.ts",
"components-chromium/iron-flex-layout/iron-flex-layout-classes.d.ts",
"components-chromium/iron-icon/iron-icon.d.ts",
"components-chromium/iron-iconset-svg/iron-iconset-svg.d.ts",
@@ -206,7 +204,6 @@
"components-chromium/iron-media-query/iron-media-query.d.ts",
"components-chromium/iron-meta/iron-meta.d.ts",
"components-chromium/iron-pages/iron-pages.d.ts",
- "components-chromium/iron-range-behavior/iron-range-behavior.d.ts",
"components-chromium/iron-resizable-behavior/iron-resizable-behavior.d.ts",
"components-chromium/iron-scroll-target-behavior/iron-scroll-target-behavior.d.ts",
"components-chromium/iron-scroll-threshold/iron-scroll-threshold.d.ts",
@@ -272,8 +269,10 @@
if (is_chromeos_ash) {
definitions += [
"components-chromium/iron-a11y-announcer/iron-a11y-announcer.d.ts",
+ "components-chromium/iron-collapse/iron-collapse.d.ts",
"components-chromium/iron-dropdown/iron-dropdown.d.ts",
"components-chromium/iron-dropdown/iron-dropdown-scroll-manager.d.ts",
+ "components-chromium/iron-fit-behavior/iron-fit-behavior.d.ts",
"components-chromium/iron-location/iron-location.d.ts",
"components-chromium/iron-location/iron-query-params.d.ts",
"components-chromium/iron-overlay-behavior/iron-focusables-helper.d.ts",
@@ -281,6 +280,7 @@
"components-chromium/iron-overlay-behavior/iron-overlay-behavior.d.ts",
"components-chromium/iron-overlay-behavior/iron-overlay-manager.d.ts",
"components-chromium/iron-overlay-behavior/iron-scroll-manager.d.ts",
+ "components-chromium/iron-range-behavior/iron-range-behavior.d.ts",
"components-chromium/neon-animation/animations/fade-in-animation.d.ts",
"components-chromium/neon-animation/animations/fade-out-animation.d.ts",
"components-chromium/neon-animation/neon-animatable-behavior.d.ts",
