| Index: chrome/browser/resources/net_internals/browser_bridge.js
|
| diff --git a/chrome/browser/resources/net_internals/browser_bridge.js b/chrome/browser/resources/net_internals/browser_bridge.js
|
| index 4e48bbcfa8c850da34641aecffa334cbac22c929..112a006e7103ab7c280c64a4e2dd7295f45fffd8 100644
|
| --- a/chrome/browser/resources/net_internals/browser_bridge.js
|
| +++ b/chrome/browser/resources/net_internals/browser_bridge.js
|
| @@ -39,44 +39,41 @@ var BrowserBridge = (function() {
|
|
|
| // Add PollableDataHelpers for NetInfoSources, which retrieve information
|
| // directly from the network stack.
|
| - this.addNetInfoPollableDataHelper('proxySettings',
|
| - 'onProxySettingsChanged');
|
| + this.addNetInfoPollableDataHelper(
|
| + 'proxySettings', 'onProxySettingsChanged');
|
| this.addNetInfoPollableDataHelper('badProxies', 'onBadProxiesChanged');
|
| - this.addNetInfoPollableDataHelper('hostResolverInfo',
|
| - 'onHostResolverInfoChanged');
|
| - this.addNetInfoPollableDataHelper('socketPoolInfo',
|
| - 'onSocketPoolInfoChanged');
|
| - this.addNetInfoPollableDataHelper('spdySessionInfo',
|
| - 'onSpdySessionInfoChanged');
|
| + this.addNetInfoPollableDataHelper(
|
| + 'hostResolverInfo', 'onHostResolverInfoChanged');
|
| + this.addNetInfoPollableDataHelper(
|
| + 'socketPoolInfo', 'onSocketPoolInfoChanged');
|
| + this.addNetInfoPollableDataHelper(
|
| + 'spdySessionInfo', 'onSpdySessionInfoChanged');
|
| this.addNetInfoPollableDataHelper('spdyStatus', 'onSpdyStatusChanged');
|
| - this.addNetInfoPollableDataHelper('altSvcMappings',
|
| - 'onAltSvcMappingsChanged');
|
| + this.addNetInfoPollableDataHelper(
|
| + 'altSvcMappings', 'onAltSvcMappingsChanged');
|
| this.addNetInfoPollableDataHelper('quicInfo', 'onQuicInfoChanged');
|
| this.addNetInfoPollableDataHelper('sdchInfo', 'onSdchInfoChanged');
|
| - this.addNetInfoPollableDataHelper('httpCacheInfo',
|
| - 'onHttpCacheInfoChanged');
|
| + this.addNetInfoPollableDataHelper(
|
| + 'httpCacheInfo', 'onHttpCacheInfoChanged');
|
|
|
| // Add other PollableDataHelpers.
|
| - this.pollableDataHelpers_.sessionNetworkStats =
|
| - new PollableDataHelper('onSessionNetworkStatsChanged',
|
| - this.sendGetSessionNetworkStats.bind(this));
|
| - this.pollableDataHelpers_.historicNetworkStats =
|
| - new PollableDataHelper('onHistoricNetworkStatsChanged',
|
| - this.sendGetHistoricNetworkStats.bind(this));
|
| + this.pollableDataHelpers_.sessionNetworkStats = new PollableDataHelper(
|
| + 'onSessionNetworkStatsChanged',
|
| + this.sendGetSessionNetworkStats.bind(this));
|
| + this.pollableDataHelpers_.historicNetworkStats = new PollableDataHelper(
|
| + 'onHistoricNetworkStatsChanged',
|
| + this.sendGetHistoricNetworkStats.bind(this));
|
| if (cr.isWindows) {
|
| - this.pollableDataHelpers_.serviceProviders =
|
| - new PollableDataHelper('onServiceProvidersChanged',
|
| - this.sendGetServiceProviders.bind(this));
|
| + this.pollableDataHelpers_.serviceProviders = new PollableDataHelper(
|
| + 'onServiceProvidersChanged', this.sendGetServiceProviders.bind(this));
|
| }
|
| - this.pollableDataHelpers_.prerenderInfo =
|
| - new PollableDataHelper('onPrerenderInfoChanged',
|
| - this.sendGetPrerenderInfo.bind(this));
|
| - this.pollableDataHelpers_.extensionInfo =
|
| - new PollableDataHelper('onExtensionInfoChanged',
|
| - this.sendGetExtensionInfo.bind(this));
|
| - this.pollableDataHelpers_.dataReductionProxyInfo =
|
| - new PollableDataHelper('onDataReductionProxyInfoChanged',
|
| - this.sendGetDataReductionProxyInfo.bind(this));
|
| + this.pollableDataHelpers_.prerenderInfo = new PollableDataHelper(
|
| + 'onPrerenderInfoChanged', this.sendGetPrerenderInfo.bind(this));
|
| + this.pollableDataHelpers_.extensionInfo = new PollableDataHelper(
|
| + 'onExtensionInfoChanged', this.sendGetExtensionInfo.bind(this));
|
| + this.pollableDataHelpers_.dataReductionProxyInfo = new PollableDataHelper(
|
| + 'onDataReductionProxyInfoChanged',
|
| + this.sendGetDataReductionProxyInfo.bind(this));
|
|
|
| // Setting this to true will cause messages from the browser to be ignored,
|
| // and no messages will be sent to the browser, either. Intended for use
|
| @@ -128,9 +125,8 @@ var BrowserBridge = (function() {
|
| }
|
|
|
| if (intervalMs > 0) {
|
| - this.pollIntervalId_ =
|
| - window.setInterval(this.checkForUpdatedInfo.bind(this, false),
|
| - intervalMs);
|
| + this.pollIntervalId_ = window.setInterval(
|
| + this.checkForUpdatedInfo.bind(this, false), intervalMs);
|
| }
|
| },
|
|
|
| @@ -169,10 +165,11 @@ var BrowserBridge = (function() {
|
| this.send('hstsQuery', [domain]);
|
| },
|
|
|
| - sendHSTSAdd: function(domain, sts_include_subdomains,
|
| - pkp_include_subdomains, pins) {
|
| - this.send('hstsAdd', [domain, sts_include_subdomains,
|
| - pkp_include_subdomains, pins]);
|
| + sendHSTSAdd: function(
|
| + domain, sts_include_subdomains, pkp_include_subdomains, pins) {
|
| + this.send(
|
| + 'hstsAdd',
|
| + [domain, sts_include_subdomains, pkp_include_subdomains, pins]);
|
| },
|
|
|
| sendHSTSDelete: function(domain) {
|
| @@ -239,7 +236,7 @@ var BrowserBridge = (function() {
|
| // If no constants have been received, and params does not contain the
|
| // constants, delay handling the data.
|
| if (Constants == null && command != 'receivedConstants') {
|
| - this.earlyReceivedData_.push({ command: command, params: params });
|
| + this.earlyReceivedData_.push({command: command, params: params});
|
| return;
|
| }
|
|
|
| @@ -387,8 +384,8 @@ var BrowserBridge = (function() {
|
| * If it's false, data is sent whenever it's received from the browser.
|
| */
|
| addProxySettingsObserver: function(observer, ignoreWhenUnchanged) {
|
| - this.pollableDataHelpers_.proxySettings.addObserver(observer,
|
| - ignoreWhenUnchanged);
|
| + this.pollableDataHelpers_.proxySettings.addObserver(
|
| + observer, ignoreWhenUnchanged);
|
| },
|
|
|
| /**
|
| @@ -403,8 +400,8 @@ var BrowserBridge = (function() {
|
| * bad. Note the time is in time ticks.
|
| */
|
| addBadProxiesObserver: function(observer, ignoreWhenUnchanged) {
|
| - this.pollableDataHelpers_.badProxies.addObserver(observer,
|
| - ignoreWhenUnchanged);
|
| + this.pollableDataHelpers_.badProxies.addObserver(
|
| + observer, ignoreWhenUnchanged);
|
| },
|
|
|
| /**
|
| @@ -425,8 +422,8 @@ var BrowserBridge = (function() {
|
| * observer.onSocketPoolInfoChanged(socketPoolInfo)
|
| */
|
| addSocketPoolInfoObserver: function(observer, ignoreWhenUnchanged) {
|
| - this.pollableDataHelpers_.socketPoolInfo.addObserver(observer,
|
| - ignoreWhenUnchanged);
|
| + this.pollableDataHelpers_.socketPoolInfo.addObserver(
|
| + observer, ignoreWhenUnchanged);
|
| },
|
|
|
| /**
|
| @@ -480,8 +477,8 @@ var BrowserBridge = (function() {
|
| * observer.onSpdyStatusChanged(spdyStatus)
|
| */
|
| addSpdyStatusObserver: function(observer, ignoreWhenUnchanged) {
|
| - this.pollableDataHelpers_.spdyStatus.addObserver(observer,
|
| - ignoreWhenUnchanged);
|
| + this.pollableDataHelpers_.spdyStatus.addObserver(
|
| + observer, ignoreWhenUnchanged);
|
| },
|
|
|
| /**
|
|
|