summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/net/dns_global.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/net/dns_global.cc b/chrome/browser/net/dns_global.cc
index 434208b..c2a89c0 100644
--- a/chrome/browser/net/dns_global.cc
+++ b/chrome/browser/net/dns_global.cc
@@ -22,7 +22,9 @@
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
+#include "chrome/common/chrome_switches.h"
#include "net/base/host_resolver.h"
+#include "net/base/host_resolver_impl.h"
using base::Time;
using base::TimeDelta;
@@ -477,6 +479,9 @@ net::HostResolver* GetGlobalHostResolver() {
// Called from UI thread.
if (!global_host_resolver) {
global_host_resolver = net::CreateSystemHostResolver();
+
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableIPv6))
+ global_host_resolver->DisableIPv6(true);
}
return global_host_resolver;
}