Index: third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js |
index 0c52649cdef841f869c095485f7e0748aa4e0d0f..ad034bdf59a62c37e85f3027a42c05e1c0dae0a6 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js |
+++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js |
@@ -162,6 +162,12 @@ Network.NetworkPanel = class extends UI.Panel { |
this._networkLogShowOverviewSetting, 'largeicon-waterfall', Common.UIString('Show overview'), |
Common.UIString('Hide overview')); |
this._panelToolbar.appendToolbarItem(showOverviewButton); |
+ |
+ if (Runtime.experiments.isEnabled('networkGroupingRequests')) { |
+ this._panelToolbar.appendToolbarItem(new UI.ToolbarSettingCheckbox( |
+ Common.moduleSetting('network.group-by-frame'), '', Common.UIString('Group by frame'))); |
+ } |
+ |
this._panelToolbar.appendSeparator(); |
this._preserveLogCheckbox = new UI.ToolbarCheckbox( |
@@ -179,25 +185,9 @@ Network.NetworkPanel = class extends UI.Panel { |
this._panelToolbar.appendToolbarItem(NetworkConditions.NetworkConditionsSelector.createOfflineToolbarCheckbox()); |
this._panelToolbar.appendToolbarItem(this._createNetworkConditionsSelect()); |
- this._setupGroupingCombo(); |
- |
this._panelToolbar.appendToolbarItem(new UI.ToolbarItem(this._progressBarContainer)); |
} |
- _setupGroupingCombo() { |
- if (!Runtime.experiments.isEnabled('networkGroupingRequests')) |
- return; |
- /** @type {!Array<!{value: string, label: string, title: string}>} */ |
- var options = [{value: '', label: Common.UIString('No grouping'), title: Common.UIString('No grouping')}]; |
- for (var name of this._networkLogView.groupLookups().keys()) |
- options.push({value: name, label: Common.UIString(name), title: Common.UIString(name)}); |
- |
- var setting = Common.settings.createSetting('networkGrouping', ''); |
- this._panelToolbar.appendToolbarItem(new UI.ToolbarSettingComboBox(options, setting, Common.UIString('Group by'))); |
- setting.addChangeListener(event => this._networkLogView.setGrouping(/** @type {string} */ (event.data))); |
- this._networkLogView.setGrouping(/** @type {string} */ (setting.get())); |
- } |
- |
/** |
* @return {!UI.ToolbarComboBox} |
*/ |