Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1962)

Unified Diff: chrome/browser/resources/net_internals/dns_view.js

Issue 19286002: Remove interface probing for IPv6 support from HostResolverImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make --enable-ipv6 disable probing. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/net_internals/dns_view.js
diff --git a/chrome/browser/resources/net_internals/dns_view.js b/chrome/browser/resources/net_internals/dns_view.js
index df96558254dbe26da173e78b24f5152d1f9ded54..806668f323263f3e302316fee5ba24a14aa019f7 100644
--- a/chrome/browser/resources/net_internals/dns_view.js
+++ b/chrome/browser/resources/net_internals/dns_view.js
@@ -34,16 +34,9 @@ var DnsView = (function() {
$(DnsView.ENABLE_IPV6_BUTTON_ID).onclick =
g_browser.enableIPv6.bind(g_browser);
- $(DnsView.IPV6_PROBE_BUTTON_ID).onclick = this.runIPv6Probe_.bind(this);
$(DnsView.CLEAR_CACHE_BUTTON_ID).onclick =
g_browser.sendClearHostResolverCache.bind(g_browser);
- // Used to track IPv6 probes.
- EventsTracker.getInstance().addLogEntryObserver(this);
- // ID of most recently started IPv6 probe job. Once the job completes,
- // set back to -1.
- this.ipv6ProbeJobSourceId_ = -1;
-
// Register to receive changes to the host resolver info.
g_browser.addHostResolverInfoObserver(this, false);
}
@@ -58,10 +51,6 @@ var DnsView = (function() {
DnsView.IPV6_DISABLED_SPAN_ID = 'dns-view-ipv6-disabled';
DnsView.ENABLE_IPV6_BUTTON_ID = 'dns-view-enable-ipv6';
- DnsView.IPV6_PROBE_RUNNING_SPAN_ID = 'dns-view-ipv6-probe-running';
- DnsView.IPV6_PROBE_COMPLETE_SPAN_ID = 'dns-view-ipv6-probe-complete';
- DnsView.IPV6_PROBE_BUTTON_ID = 'dns-view-run-ipv6-probe';
-
DnsView.INTERNAL_DNS_ENABLED_SPAN_ID = 'dns-view-internal-dns-enabled';
DnsView.INTERNAL_DNS_INVALID_CONFIG_SPAN_ID =
'dns-view-internal-dns-invalid-config';
@@ -80,12 +69,6 @@ var DnsView = (function() {
// Inherit the superclass's methods.
__proto__: superClass.prototype,
- onLoadLogStart: function(polledData, tabData, logDump) {
- // Clear information on whether or not an IPv6 probe is running. Needs
- // to be done before loading the events.
- this.setIPv6ProbeJobLookupRunning_(false, -1);
- },
-
onLoadLogFinish: function(data) {
return this.onHostResolverInfoChanged(data.hostResolverInfo);
},
@@ -165,54 +148,6 @@ var DnsView = (function() {
$(DnsView.EXPIRED_SPAN_ID).innerText = expiredEntries;
return true;
},
-
- /**
- * Must be called whenever an IPv6 probe job starts or stops running.
- * @param {bool} running True if a probe job is running.
- * @param {sourceId} sourceId Source ID of the running probe job, if there
- * is one. -1 if |running| is false or we don't yet have the ID.
- */
- setIPv6ProbeJobLookupRunning_: function(running, sourceId) {
- setNodeDisplay($(DnsView.IPV6_PROBE_RUNNING_SPAN_ID), running);
- setNodeDisplay($(DnsView.IPV6_PROBE_COMPLETE_SPAN_ID), !running);
- this.ipv6ProbeJobSourceId_ = sourceId;
- },
-
- /**
- * Triggers a new IPv6 probe and displays the probe running message.
- */
- runIPv6Probe_: function() {
- // Since there's no source ID yet, have to just use -1. We'll get the
- // ID when we see the start event for the probe.
- this.setIPv6ProbeJobLookupRunning_(true, -1);
- g_browser.sendRunIPv6Probe();
- },
-
- onReceivedLogEntries: function(logEntries) {
- for (var i = 0; i < logEntries.length; ++i) {
- if (logEntries[i].source.type != EventSourceType.IPV6_PROBE_JOB ||
- logEntries[i].type != EventType.IPV6_PROBE_RUNNING) {
- continue;
- }
-
- // For IPV6_PROBE_JOB events, update the display depending on whether or
- // not a probe job is running. Only track the most recently started
- // probe job, as it will cancel any older jobs.
- if (logEntries[i].phase == EventPhase.PHASE_BEGIN) {
- this.setIPv6ProbeJobLookupRunning_(true, logEntries[i].source.id);
- } else if (logEntries[i].source.id == this.ipv6ProbeJobSourceId_) {
- this.setIPv6ProbeJobLookupRunning_(false, -1);
- g_browser.sendGetHostResolverInfo();
- }
- }
- },
-
- /**
- * Since the only thing that matters is the source ID of the active probe
- * job, which clearing events doesn't change, do nothing.
- */
- onAllLogEntriesDeleted: function() {
- },
};
/**
« no previous file with comments | « chrome/browser/resources/net_internals/dns_view.html ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698