Remove Network-Panel-Filter-Bar-Redesign experiment
Doc: go/chrome-devtools-remove-filterbar-experiment:design
Bug: 362672528
Change-Id: I7d9497f58a2458e5bc7b5b8e65de0f2fd1506677
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6507932
Commit-Queue: Wolfgang Beyer <[email protected]>
Reviewed-by: Kateryna Prokopenko <[email protected]>
Auto-Submit: Wolfgang Beyer <[email protected]>
diff --git a/front_end/panels/network/NetworkLogView.ts b/front_end/panels/network/NetworkLogView.ts
index c220bd6..523505a 100644
--- a/front_end/panels/network/NetworkLogView.ts
+++ b/front_end/panels/network/NetworkLogView.ts
@@ -39,7 +39,6 @@
import * as Host from '../../core/host/host.js';
import * as i18n from '../../core/i18n/i18n.js';
import * as Platform from '../../core/platform/platform.js';
-import * as Root from '../../core/root/root.js';
import * as SDK from '../../core/sdk/sdk.js';
import * as Protocol from '../../generated/protocol.js';
import * as Bindings from '../../models/bindings/bindings.js';
@@ -611,65 +610,16 @@
jslogContext:
Platform.StringUtilities.toKebabCase(key),
}));
+ this.moreFiltersDropDownUI = new MoreFiltersDropDownUI();
+ this.moreFiltersDropDownUI.addEventListener(UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged, this);
+ filterBar.addFilter(this.moreFiltersDropDownUI);
- if (Root.Runtime.experiments.isEnabled(Root.Runtime.ExperimentName.NETWORK_PANEL_FILTER_BAR_REDESIGN)) {
- this.moreFiltersDropDownUI = new MoreFiltersDropDownUI();
- this.moreFiltersDropDownUI.addEventListener(UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged, this);
- filterBar.addFilter(this.moreFiltersDropDownUI);
-
- this.resourceCategoryFilterUI =
- new UI.FilterBar.NamedBitSetFilterUI(filterItems, this.networkResourceTypeFiltersSetting);
- UI.ARIAUtils.setLabel(this.resourceCategoryFilterUI.element(), i18nString(UIStrings.requestTypesToInclude));
- this.resourceCategoryFilterUI.addEventListener(
- UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged.bind(this), this);
- filterBar.addFilter(this.resourceCategoryFilterUI);
- } else {
- this.dataURLFilterUI = new UI.FilterBar.CheckboxFilterUI(
- i18nString(UIStrings.hideDataUrls), true, this.networkHideDataURLSetting, 'hide-data-urls');
- this.dataURLFilterUI.addEventListener(
- UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged.bind(this), this);
- UI.Tooltip.Tooltip.install(this.dataURLFilterUI.element(), i18nString(UIStrings.hidesDataAndBlobUrls));
- filterBar.addFilter(this.dataURLFilterUI);
-
- this.hideChromeExtensionsUI = new UI.FilterBar.CheckboxFilterUI(
- i18nString(UIStrings.chromeExtensions), true, this.networkHideChromeExtensions, 'hide-extension-urls');
- this.hideChromeExtensionsUI.addEventListener(
- UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged.bind(this), this);
- UI.Tooltip.Tooltip.install(this.hideChromeExtensionsUI.element(), i18nString(UIStrings.hideChromeExtension));
- filterBar.addFilter(this.hideChromeExtensionsUI);
-
- this.resourceCategoryFilterUI =
- new UI.FilterBar.NamedBitSetFilterUI(filterItems, this.networkResourceTypeFiltersSetting);
- UI.ARIAUtils.setLabel(this.resourceCategoryFilterUI.element(), i18nString(UIStrings.requestTypesToInclude));
- this.resourceCategoryFilterUI.addEventListener(
- UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged.bind(this), this);
- filterBar.addFilter(this.resourceCategoryFilterUI);
-
- this.onlyBlockedResponseCookiesFilterUI = new UI.FilterBar.CheckboxFilterUI(
- i18nString(UIStrings.hasBlockedCookies), true, this.networkShowBlockedCookiesOnlySetting,
- 'only-show-blocked-cookies');
- this.onlyBlockedResponseCookiesFilterUI.addEventListener(
- UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged.bind(this), this);
- UI.Tooltip.Tooltip.install(
- this.onlyBlockedResponseCookiesFilterUI.element(), i18nString(UIStrings.onlyShowRequestsWithBlockedCookies));
- filterBar.addFilter(this.onlyBlockedResponseCookiesFilterUI);
-
- this.onlyBlockedRequestsUI = new UI.FilterBar.CheckboxFilterUI(
- i18nString(UIStrings.blockedRequests), true, this.networkOnlyBlockedRequestsSetting,
- 'only-show-blocked-requests');
- this.onlyBlockedRequestsUI.addEventListener(
- UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged.bind(this), this);
- UI.Tooltip.Tooltip.install(this.onlyBlockedRequestsUI.element(), i18nString(UIStrings.onlyShowBlockedRequests));
- filterBar.addFilter(this.onlyBlockedRequestsUI);
-
- this.onlyThirdPartyFilterUI = new UI.FilterBar.CheckboxFilterUI(
- i18nString(UIStrings.thirdParty), true, this.networkOnlyThirdPartySetting, 'only-show-third-party');
- this.onlyThirdPartyFilterUI.addEventListener(
- UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged.bind(this), this);
- UI.Tooltip.Tooltip.install(
- this.onlyThirdPartyFilterUI.element(), i18nString(UIStrings.onlyShowThirdPartyRequests));
- filterBar.addFilter(this.onlyThirdPartyFilterUI);
- }
+ this.resourceCategoryFilterUI =
+ new UI.FilterBar.NamedBitSetFilterUI(filterItems, this.networkResourceTypeFiltersSetting);
+ UI.ARIAUtils.setLabel(this.resourceCategoryFilterUI.element(), i18nString(UIStrings.requestTypesToInclude));
+ this.resourceCategoryFilterUI.addEventListener(
+ UI.FilterBar.FilterUIEvents.FILTER_CHANGED, this.filterChanged.bind(this), this);
+ filterBar.addFilter(this.resourceCategoryFilterUI);
this.filterParser = new TextUtils.TextUtils.FilterParser(searchKeys);
this.suggestionBuilder =
@@ -1617,19 +1567,11 @@
// TODO(crbug.com/1477668)
setTextFilterValue(filterString: string): void {
this.textFilterUI.setValue(filterString);
- if (Root.Runtime.experiments.isEnabled(Root.Runtime.ExperimentName.NETWORK_PANEL_FILTER_BAR_REDESIGN)) {
- this.networkHideDataURLSetting.set(false);
- this.networkShowBlockedCookiesOnlySetting.set(false);
- this.networkOnlyBlockedRequestsSetting.set(false);
- this.networkOnlyThirdPartySetting.set(false);
- this.networkHideChromeExtensions.set(false);
- } else {
- this.dataURLFilterUI?.setChecked(false);
- this.onlyBlockedResponseCookiesFilterUI?.setChecked(false);
- this.onlyBlockedRequestsUI?.setChecked(false);
- this.onlyThirdPartyFilterUI?.setChecked(false);
- this.hideChromeExtensionsUI?.setChecked(false);
- }
+ this.networkHideDataURLSetting.set(false);
+ this.networkShowBlockedCookiesOnlySetting.set(false);
+ this.networkOnlyBlockedRequestsSetting.set(false);
+ this.networkOnlyThirdPartySetting.set(false);
+ this.networkHideChromeExtensions.set(false);
this.resourceCategoryFilterUI.reset();
}
@@ -2019,22 +1961,13 @@
if (!this.resourceCategoryFilterUI.accept(categoryName)) {
return false;
}
- const [hideDataURL, blockedCookies, blockedRequests, thirdParty, hideExtensionURL] =
- Root.Runtime.experiments.isEnabled(Root.Runtime.ExperimentName.NETWORK_PANEL_FILTER_BAR_REDESIGN) ?
- [
- this.networkHideDataURLSetting.get(),
- this.networkShowBlockedCookiesOnlySetting.get(),
- this.networkOnlyBlockedRequestsSetting.get(),
- this.networkOnlyThirdPartySetting.get(),
- this.networkHideChromeExtensions.get(),
- ] :
- [
- this.dataURLFilterUI?.checked(),
- this.onlyBlockedResponseCookiesFilterUI?.checked(),
- this.onlyBlockedRequestsUI?.checked(),
- this.onlyThirdPartyFilterUI?.checked(),
- this.hideChromeExtensionsUI?.checked(),
- ];
+ const [hideDataURL, blockedCookies, blockedRequests, thirdParty, hideExtensionURL] = [
+ this.networkHideDataURLSetting.get(),
+ this.networkShowBlockedCookiesOnlySetting.get(),
+ this.networkOnlyBlockedRequestsSetting.get(),
+ this.networkOnlyThirdPartySetting.get(),
+ this.networkHideChromeExtensions.get(),
+ ];
if (hideDataURL && (request.parsedURL.isDataURL() || request.parsedURL.isBlobURL())) {
return false;
