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

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

Issue 1135373002: Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « net/dns/mapped_host_resolver.h ('k') | net/filter/filter.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/mapped_host_resolver.h" 5 #include "net/dns/mapped_host_resolver.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "net/base/host_port_pair.h" 8 #include "net/base/host_port_pair.h"
9 #include "net/base/net_errors.h" 9 #include "net/base/net_errors.h"
10 #include "net/base/net_util.h" 10 #include "net/base/net_util.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 49
50 void MappedHostResolver::SetDnsClientEnabled(bool enabled) { 50 void MappedHostResolver::SetDnsClientEnabled(bool enabled) {
51 impl_->SetDnsClientEnabled(enabled); 51 impl_->SetDnsClientEnabled(enabled);
52 } 52 }
53 53
54 HostCache* MappedHostResolver::GetHostCache() { 54 HostCache* MappedHostResolver::GetHostCache() {
55 return impl_->GetHostCache(); 55 return impl_->GetHostCache();
56 } 56 }
57 57
58 base::Value* MappedHostResolver::GetDnsConfigAsValue() const { 58 scoped_ptr<base::Value> MappedHostResolver::GetDnsConfigAsValue() const {
59 return impl_->GetDnsConfigAsValue(); 59 return impl_->GetDnsConfigAsValue();
60 } 60 }
61 61
62 int MappedHostResolver::ApplyRules(RequestInfo* info) const { 62 int MappedHostResolver::ApplyRules(RequestInfo* info) const {
63 HostPortPair host_port(info->host_port_pair()); 63 HostPortPair host_port(info->host_port_pair());
64 if (rules_.RewriteHost(&host_port)) { 64 if (rules_.RewriteHost(&host_port)) {
65 if (host_port.host() == "~NOTFOUND") 65 if (host_port.host() == "~NOTFOUND")
66 return ERR_NAME_NOT_RESOLVED; 66 return ERR_NAME_NOT_RESOLVED;
67 info->set_host_port_pair(host_port); 67 info->set_host_port_pair(host_port);
68 } 68 }
69 return OK; 69 return OK;
70 } 70 }
71 71
72 } // namespace net 72 } // namespace net
OLDNEW
« no previous file with comments | « net/dns/mapped_host_resolver.h ('k') | net/filter/filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698