Commit c4c1cb35 authored by allada's avatar allada Committed by Commit bot

[Devtools] Moved preserve log to a setting

Moves preserve log to a setting. This should allow it to be changed in
the actions menu and will allow NetworkLog to check the state of
preserve log for followup patch to move some functionality into
NetworkLog.

R=dgozman,pfeldman
BUG=None

Review-Url: https://codereview.chromium.org/2903183002
Cr-Commit-Position: refs/heads/master@{#474887}
parent 2e2b178d
......@@ -96,7 +96,6 @@ Network.NetworkLogView = class extends UI.VBox {
this.badgePool = new ProductRegistry.BadgePool();
this._recording = false;
this._preserveLog = false;
this._headerHeight = 0;
......@@ -398,13 +397,6 @@ Network.NetworkLogView = class extends UI.VBox {
this._updateSummaryBar();
}
/**
* @param {boolean} preserveLog
*/
setPreserveLog(preserveLog) {
this._preserveLog = preserveLog;
}
/**
* @override
* @param {!SDK.NetworkManager} networkManager
......@@ -1070,7 +1062,7 @@ Network.NetworkLogView = class extends UI.VBox {
requestsToPick.push(request);
}
if (!this._preserveLog) {
if (!Common.moduleSetting('network.preserve-log').get()) {
this.reset();
for (var i = 0; i < requestsToPick.length; ++i)
this._appendRequest(requestsToPick[i]);
......
......@@ -174,12 +174,10 @@ Network.NetworkPanel = class extends UI.Panel {
}
this._panelToolbar.appendSeparator();
this._preserveLogCheckbox = new UI.ToolbarCheckbox(
Common.UIString('Preserve log'), Common.UIString('Do not clear log on page reload / navigation'));
this._preserveLogCheckbox.inputElement.addEventListener(
'change', this._onPreserveLogCheckboxChanged.bind(this), false);
this._panelToolbar.appendToolbarItem(this._preserveLogCheckbox);
this._preserveLogSetting = Common.moduleSetting('network.preserve-log');
this._panelToolbar.appendToolbarItem(new UI.ToolbarSettingCheckbox(
this._preserveLogSetting, Common.UIString('Do not clear log on page reload / navigation'),
Common.UIString('Preserve log')));
this._disableCacheCheckbox = new UI.ToolbarSettingCheckbox(
Common.moduleSetting('cacheDisabled'), Common.UIString('Disable cache (while DevTools is open)'),
......@@ -204,7 +202,7 @@ Network.NetworkPanel = class extends UI.Panel {
}
_toggleRecording() {
if (!this._preserveLogCheckbox.checked() && !this._toggleRecordAction.toggled())
if (!this._preserveLogSetting.get() && !this._toggleRecordAction.toggled())
this._reset();
this._toggleRecord(!this._toggleRecordAction.toggled());
}
......@@ -241,13 +239,6 @@ Network.NetworkPanel = class extends UI.Panel {
this._networkLogView.addFilmStripFrames(timestamps);
}
/**
* @param {!Event} event
*/
_onPreserveLogCheckboxChanged(event) {
this._networkLogView.setPreserveLog(this._preserveLogCheckbox.checked());
}
/**
* @param {!Common.Event} event
*/
......@@ -268,7 +259,7 @@ Network.NetworkPanel = class extends UI.Panel {
* @param {!Common.Event} event
*/
_willReloadPage(event) {
if (!this._preserveLogCheckbox.checked())
if (!this._preserveLogSetting.get())
this._reset();
this._toggleRecord(true);
if (this._pendingStopTimer) {
......
......@@ -62,6 +62,26 @@
}
]
},
{
"type": "setting",
"category": "Network",
"storageType": "session",
"title": "Preserve log",
"settingName": "network.preserve-log",
"settingType": "boolean",
"defaultValue": false,
"tags": "preserve, clear, reset",
"options": [
{
"value": true,
"title": "Do not preserve log on page reload / navigation"
},
{
"value": false,
"title": "Preserve log on page reload / navigation"
}
]
},
{
"type": "@UI.ActionDelegate",
"actionId": "network.toggle-recording",
......
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