[global] Remaps SDK.multiTargetNetworkManager
[email protected]
Bug: 1058320
Change-Id: Icb43c143ef0ca14bd3c9280cc5096862c892d030
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2173373
Commit-Queue: Tim van der Lippe <[email protected]>
Reviewed-by: Paul Lewis <[email protected]>
diff --git a/front_end/network/BlockedURLsPane.js b/front_end/network/BlockedURLsPane.js
index e981f2b..f297ea0 100644
--- a/front_end/network/BlockedURLsPane.js
+++ b/front_end/network/BlockedURLsPane.js
@@ -18,9 +18,10 @@
this.registerRequiredCSS('network/blockedURLsPane.css');
_instance = this;
- this._manager = self.SDK.multitargetNetworkManager;
- this._manager.addEventListener(
- SDK.NetworkManager.MultitargetNetworkManager.Events.BlockedPatternsChanged, this._update, this);
+ this._manager = SDK.NetworkManager.MultitargetNetworkManager.instance();
+ this._manager.addEventListener(SDK.NetworkManager.MultitargetNetworkManager.Events.BlockedPatternsChanged, () => {
+ this._update();
+ }, this);
this._toolbar = new UI.Toolbar.Toolbar('', this.contentElement);
this._enabledCheckbox = new UI.Toolbar.ToolbarCheckbox(
@@ -190,7 +191,7 @@
}
/**
- * @return {!Promise<?>}
+ * @return {!Promise<void>}
*/
_update() {
const enabled = this._manager.blockingEnabled();
diff --git a/front_end/network/NetworkConfigView.js b/front_end/network/NetworkConfigView.js
index 8e2ad3c..c53a8ad 100644
--- a/front_end/network/NetworkConfigView.js
+++ b/front_end/network/NetworkConfigView.js
@@ -149,7 +149,7 @@
if (autoCheckbox.checked) {
return;
}
- self.SDK.multitargetNetworkManager.setCustomUserAgentOverride(customUserAgentSetting.get());
+ SDK.NetworkManager.MultitargetNetworkManager.instance().setCustomUserAgentOverride(customUserAgentSetting.get());
});
const customUserAgentSelectBox = section.createChild('div', 'network-config-ua-custom');
autoCheckbox.addEventListener('change', userAgentSelectBoxChanged);
@@ -167,7 +167,7 @@
customSelectAndInput.input.disabled = !useCustomUA;
customSelectAndInput.error.hidden = !useCustomUA;
const customUA = useCustomUA ? customUserAgentSetting.get() : '';
- self.SDK.multitargetNetworkManager.setCustomUserAgentOverride(customUA);
+ SDK.NetworkManager.MultitargetNetworkManager.instance().setCustomUserAgentOverride(customUA);
}
}
}
diff --git a/front_end/network/NetworkLogView.js b/front_end/network/NetworkLogView.js
index 7666587..3495e03 100644
--- a/front_end/network/NetworkLogView.js
+++ b/front_end/network/NetworkLogView.js
@@ -1438,7 +1438,7 @@
if (request) {
const maxBlockedURLLength = 20;
- const manager = self.SDK.multitargetNetworkManager;
+ const manager = SDK.NetworkManager.MultitargetNetworkManager.instance();
let patterns = manager.blockedPatterns();
/**
@@ -1570,13 +1570,13 @@
_clearBrowserCache() {
if (confirm(Common.UIString.UIString('Are you sure you want to clear browser cache?'))) {
- self.SDK.multitargetNetworkManager.clearBrowserCache();
+ SDK.NetworkManager.MultitargetNetworkManager.instance().clearBrowserCache();
}
}
_clearBrowserCookies() {
if (confirm(Common.UIString.UIString('Are you sure you want to clear browser cookies?'))) {
- self.SDK.multitargetNetworkManager.clearBrowserCookies();
+ SDK.NetworkManager.MultitargetNetworkManager.instance().clearBrowserCookies();
}
}
