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

Side by Side Diff: net/base/mapped_host_resolver.h

Issue 7492059: HostResolver: don't interpret NULL callback argument as a request to do synchronous resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged common code from Resolve and ResolveFromCache to a single function. Created 9 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 NET_BASE_MAPPED_HOST_RESOLVER_H_ 5 #ifndef NET_BASE_MAPPED_HOST_RESOLVER_H_
6 #define NET_BASE_MAPPED_HOST_RESOLVER_H_ 6 #define NET_BASE_MAPPED_HOST_RESOLVER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 30 matching lines...) Expand all
41 // Takes a comma separated list of rules, and assigns them to this resolver. 41 // Takes a comma separated list of rules, and assigns them to this resolver.
42 void SetRulesFromString(const std::string& rules_string) { 42 void SetRulesFromString(const std::string& rules_string) {
43 rules_.SetRulesFromString(rules_string); 43 rules_.SetRulesFromString(rules_string);
44 } 44 }
45 45
46 // HostResolver methods: 46 // HostResolver methods:
47 virtual int Resolve(const RequestInfo& info, 47 virtual int Resolve(const RequestInfo& info,
48 AddressList* addresses, 48 AddressList* addresses,
49 CompletionCallback* callback, 49 CompletionCallback* callback,
50 RequestHandle* out_req, 50 RequestHandle* out_req,
51 const BoundNetLog& net_log); 51 const BoundNetLog& net_log) OVERRIDE;
52 virtual void CancelRequest(RequestHandle req); 52 virtual int ResolveFromCache(const RequestInfo& info,
53 virtual void AddObserver(Observer* observer); 53 AddressList* addresses,
54 virtual void RemoveObserver(Observer* observer); 54 const BoundNetLog& net_log) OVERRIDE;
55 virtual HostResolverImpl* GetAsHostResolverImpl(); 55 virtual void CancelRequest(RequestHandle req) OVERRIDE;
56 virtual void AddObserver(Observer* observer) OVERRIDE;
57 virtual void RemoveObserver(Observer* observer) OVERRIDE;
58 virtual HostResolverImpl* GetAsHostResolverImpl() OVERRIDE;
56 59
57 private: 60 private:
58 scoped_ptr<HostResolver> impl_; 61 scoped_ptr<HostResolver> impl_;
59 62
60 HostMappingRules rules_; 63 HostMappingRules rules_;
61 }; 64 };
62 65
63 } // namespace net 66 } // namespace net
64 67
65 #endif // NET_BASE_MAPPED_HOST_RESOLVER_H_ 68 #endif // NET_BASE_MAPPED_HOST_RESOLVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698