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

Side by Side Diff: chrome/common/local_discovery/service_discovery_client_impl.h

Issue 1534583002: Migrate Local Discovery from net::IPAddressNumber to net::IPAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_ 5 #ifndef CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
6 #define CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_ 6 #define CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 187
188 // Convert a TXT record to a vector of strings (metadata). 188 // Convert a TXT record to a vector of strings (metadata).
189 const std::vector<std::string>& RecordToMetadata( 189 const std::vector<std::string>& RecordToMetadata(
190 const net::RecordParsed* record) const; 190 const net::RecordParsed* record) const;
191 191
192 // Convert an SRV record to a host and port pair. 192 // Convert an SRV record to a host and port pair.
193 net::HostPortPair RecordToAddress( 193 net::HostPortPair RecordToAddress(
194 const net::RecordParsed* record) const; 194 const net::RecordParsed* record) const;
195 195
196 // Convert an A record to an IP address. 196 // Convert an A record to an IP address.
197 const net::IPAddressNumber& RecordToIPAddress( 197 const net::IPAddress RecordToIPAddress(const net::RecordParsed* record) const;
198 const net::RecordParsed* record) const;
199 198
200 // Convert an MDns status to a service discovery status. 199 // Convert an MDns status to a service discovery status.
201 RequestStatus MDnsStatusToRequestStatus( 200 RequestStatus MDnsStatusToRequestStatus(
202 net::MDnsTransaction::Result status) const; 201 net::MDnsTransaction::Result status) const;
203 202
204 bool CreateTxtTransaction(); 203 bool CreateTxtTransaction();
205 bool CreateSrvTransaction(); 204 bool CreateSrvTransaction();
206 void CreateATransaction(); 205 void CreateATransaction();
207 206
208 std::string service_name_; 207 std::string service_name_;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 net::AddressFamily address_family_; 248 net::AddressFamily address_family_;
250 IPAddressCallback callback_; 249 IPAddressCallback callback_;
251 250
252 scoped_ptr<net::MDnsTransaction> transaction_a_; 251 scoped_ptr<net::MDnsTransaction> transaction_a_;
253 scoped_ptr<net::MDnsTransaction> transaction_aaaa_; 252 scoped_ptr<net::MDnsTransaction> transaction_aaaa_;
254 253
255 int transactions_finished_; 254 int transactions_finished_;
256 255
257 net::MDnsClient* mdns_client_; 256 net::MDnsClient* mdns_client_;
258 257
259 net::IPAddressNumber address_ipv4_; 258 net::IPAddress address_ipv4_;
260 net::IPAddressNumber address_ipv6_; 259 net::IPAddress address_ipv6_;
261 260
262 base::CancelableCallback<void()> timeout_callback_; 261 base::CancelableCallback<void()> timeout_callback_;
263 262
264 DISALLOW_COPY_AND_ASSIGN(LocalDomainResolverImpl); 263 DISALLOW_COPY_AND_ASSIGN(LocalDomainResolverImpl);
265 }; 264 };
266 265
267 266
268 } // namespace local_discovery 267 } // namespace local_discovery
269 268
270 #endif // CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_ 269 #endif // CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698