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

Side by Side Diff: net/dns/host_resolver.cc

Issue 384503005: Merge 280230 "Flag myIpAddress requests for chromeos" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2062/src/
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/dns/host_resolver.h ('k') | net/proxy/proxy_resolver_v8_tracing.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/dns/host_resolver.h" 5 #include "net/dns/host_resolver.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 : max_concurrent_resolves(kDefaultParallelism), 87 : max_concurrent_resolves(kDefaultParallelism),
88 max_retry_attempts(kDefaultRetryAttempts), 88 max_retry_attempts(kDefaultRetryAttempts),
89 enable_caching(true) { 89 enable_caching(true) {
90 } 90 }
91 91
92 HostResolver::RequestInfo::RequestInfo(const HostPortPair& host_port_pair) 92 HostResolver::RequestInfo::RequestInfo(const HostPortPair& host_port_pair)
93 : host_port_pair_(host_port_pair), 93 : host_port_pair_(host_port_pair),
94 address_family_(ADDRESS_FAMILY_UNSPECIFIED), 94 address_family_(ADDRESS_FAMILY_UNSPECIFIED),
95 host_resolver_flags_(0), 95 host_resolver_flags_(0),
96 allow_cached_response_(true), 96 allow_cached_response_(true),
97 is_speculative_(false) {} 97 is_speculative_(false),
98 is_my_ip_address_(false) {}
98 99
99 HostResolver::~HostResolver() { 100 HostResolver::~HostResolver() {
100 } 101 }
101 102
102 AddressFamily HostResolver::GetDefaultAddressFamily() const { 103 AddressFamily HostResolver::GetDefaultAddressFamily() const {
103 return ADDRESS_FAMILY_UNSPECIFIED; 104 return ADDRESS_FAMILY_UNSPECIFIED;
104 } 105 }
105 106
106 void HostResolver::SetDnsClientEnabled(bool enabled) { 107 void HostResolver::SetDnsClientEnabled(bool enabled) {
107 } 108 }
(...skipping 15 matching lines...) Expand all
123 124
124 // static 125 // static
125 scoped_ptr<HostResolver> HostResolver::CreateDefaultResolver(NetLog* net_log) { 126 scoped_ptr<HostResolver> HostResolver::CreateDefaultResolver(NetLog* net_log) {
126 return scoped_ptr<HostResolver>(new HostResolverImpl(Options(), net_log)); 127 return scoped_ptr<HostResolver>(new HostResolverImpl(Options(), net_log));
127 } 128 }
128 129
129 HostResolver::HostResolver() { 130 HostResolver::HostResolver() {
130 } 131 }
131 132
132 } // namespace net 133 } // namespace net
OLDNEW
« no previous file with comments | « net/dns/host_resolver.h ('k') | net/proxy/proxy_resolver_v8_tracing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698