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

Side by Side Diff: chrome/browser/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: fix builders Created 4 years, 10 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_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_ 5 #ifndef CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
6 #define CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_ 6 #define CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 // Convert a TXT record to a vector of strings (metadata). 191 // Convert a TXT record to a vector of strings (metadata).
192 const std::vector<std::string>& RecordToMetadata( 192 const std::vector<std::string>& RecordToMetadata(
193 const net::RecordParsed* record) const; 193 const net::RecordParsed* record) const;
194 194
195 // Convert an SRV record to a host and port pair. 195 // Convert an SRV record to a host and port pair.
196 net::HostPortPair RecordToAddress( 196 net::HostPortPair RecordToAddress(
197 const net::RecordParsed* record) const; 197 const net::RecordParsed* record) const;
198 198
199 // Convert an A record to an IP address. 199 // Convert an A record to an IP address.
200 const net::IPAddressNumber& RecordToIPAddress( 200 net::IPAddress RecordToIPAddress(const net::RecordParsed* record) const;
201 const net::RecordParsed* record) const;
202 201
203 // Convert an MDns status to a service discovery status. 202 // Convert an MDns status to a service discovery status.
204 RequestStatus MDnsStatusToRequestStatus( 203 RequestStatus MDnsStatusToRequestStatus(
205 net::MDnsTransaction::Result status) const; 204 net::MDnsTransaction::Result status) const;
206 205
207 bool CreateTxtTransaction(); 206 bool CreateTxtTransaction();
208 bool CreateSrvTransaction(); 207 bool CreateSrvTransaction();
209 void CreateATransaction(); 208 void CreateATransaction();
210 209
211 std::string service_name_; 210 std::string service_name_;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 net::AddressFamily address_family_; 251 net::AddressFamily address_family_;
253 IPAddressCallback callback_; 252 IPAddressCallback callback_;
254 253
255 scoped_ptr<net::MDnsTransaction> transaction_a_; 254 scoped_ptr<net::MDnsTransaction> transaction_a_;
256 scoped_ptr<net::MDnsTransaction> transaction_aaaa_; 255 scoped_ptr<net::MDnsTransaction> transaction_aaaa_;
257 256
258 int transactions_finished_; 257 int transactions_finished_;
259 258
260 net::MDnsClient* mdns_client_; 259 net::MDnsClient* mdns_client_;
261 260
262 net::IPAddressNumber address_ipv4_; 261 net::IPAddress address_ipv4_;
263 net::IPAddressNumber address_ipv6_; 262 net::IPAddress address_ipv6_;
264 263
265 base::CancelableCallback<void()> timeout_callback_; 264 base::CancelableCallback<void()> timeout_callback_;
266 265
267 DISALLOW_COPY_AND_ASSIGN(LocalDomainResolverImpl); 266 DISALLOW_COPY_AND_ASSIGN(LocalDomainResolverImpl);
268 }; 267 };
269 268
270 269
271 } // namespace local_discovery 270 } // namespace local_discovery
272 271
273 #endif // CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_ 272 #endif // CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698