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

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

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 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/address_sorter_win.cc ('k') | net/dns/dns_config_service_posix.h » ('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/dns_client.h" 5 #include "net/dns/dns_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "net/base/net_log.h" 9 #include "net/base/net_log.h"
10 #include "net/dns/address_sorter.h" 10 #include "net/dns/address_sorter.h"
11 #include "net/dns/dns_config_service.h" 11 #include "net/dns/dns_config_service.h"
12 #include "net/dns/dns_session.h" 12 #include "net/dns/dns_session.h"
13 #include "net/dns/dns_socket_pool.h" 13 #include "net/dns/dns_socket_pool.h"
14 #include "net/dns/dns_transaction.h" 14 #include "net/dns/dns_transaction.h"
15 #include "net/socket/client_socket_factory.h" 15 #include "net/socket/client_socket_factory.h"
16 16
17 namespace net { 17 namespace net {
18 18
19 namespace { 19 namespace {
20 20
21 class DnsClientImpl : public DnsClient { 21 class DnsClientImpl : public DnsClient {
22 public: 22 public:
23 explicit DnsClientImpl(NetLog* net_log) 23 explicit DnsClientImpl(NetLog* net_log)
24 : address_sorter_(AddressSorter::CreateAddressSorter()), 24 : address_sorter_(AddressSorter::CreateAddressSorter()),
25 net_log_(net_log) {} 25 net_log_(net_log) {}
26 26
27 virtual void SetConfig(const DnsConfig& config) OVERRIDE { 27 virtual void SetConfig(const DnsConfig& config) override {
28 factory_.reset(); 28 factory_.reset();
29 session_ = NULL; 29 session_ = NULL;
30 if (config.IsValid() && !config.unhandled_options) { 30 if (config.IsValid() && !config.unhandled_options) {
31 ClientSocketFactory* factory = ClientSocketFactory::GetDefaultFactory(); 31 ClientSocketFactory* factory = ClientSocketFactory::GetDefaultFactory();
32 scoped_ptr<DnsSocketPool> socket_pool( 32 scoped_ptr<DnsSocketPool> socket_pool(
33 config.randomize_ports ? DnsSocketPool::CreateDefault(factory) 33 config.randomize_ports ? DnsSocketPool::CreateDefault(factory)
34 : DnsSocketPool::CreateNull(factory)); 34 : DnsSocketPool::CreateNull(factory));
35 session_ = new DnsSession(config, 35 session_ = new DnsSession(config,
36 socket_pool.Pass(), 36 socket_pool.Pass(),
37 base::Bind(&base::RandInt), 37 base::Bind(&base::RandInt),
38 net_log_); 38 net_log_);
39 factory_ = DnsTransactionFactory::CreateFactory(session_.get()); 39 factory_ = DnsTransactionFactory::CreateFactory(session_.get());
40 } 40 }
41 } 41 }
42 42
43 virtual const DnsConfig* GetConfig() const OVERRIDE { 43 virtual const DnsConfig* GetConfig() const override {
44 return session_.get() ? &session_->config() : NULL; 44 return session_.get() ? &session_->config() : NULL;
45 } 45 }
46 46
47 virtual DnsTransactionFactory* GetTransactionFactory() OVERRIDE { 47 virtual DnsTransactionFactory* GetTransactionFactory() override {
48 return session_.get() ? factory_.get() : NULL; 48 return session_.get() ? factory_.get() : NULL;
49 } 49 }
50 50
51 virtual AddressSorter* GetAddressSorter() OVERRIDE { 51 virtual AddressSorter* GetAddressSorter() override {
52 return address_sorter_.get(); 52 return address_sorter_.get();
53 } 53 }
54 54
55 private: 55 private:
56 scoped_refptr<DnsSession> session_; 56 scoped_refptr<DnsSession> session_;
57 scoped_ptr<DnsTransactionFactory> factory_; 57 scoped_ptr<DnsTransactionFactory> factory_;
58 scoped_ptr<AddressSorter> address_sorter_; 58 scoped_ptr<AddressSorter> address_sorter_;
59 59
60 NetLog* net_log_; 60 NetLog* net_log_;
61 }; 61 };
62 62
63 } // namespace 63 } // namespace
64 64
65 // static 65 // static
66 scoped_ptr<DnsClient> DnsClient::CreateClient(NetLog* net_log) { 66 scoped_ptr<DnsClient> DnsClient::CreateClient(NetLog* net_log) {
67 return scoped_ptr<DnsClient>(new DnsClientImpl(net_log)); 67 return scoped_ptr<DnsClient>(new DnsClientImpl(net_log));
68 } 68 }
69 69
70 } // namespace net 70 } // namespace net
71 71
OLDNEW
« no previous file with comments | « net/dns/address_sorter_win.cc ('k') | net/dns/dns_config_service_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698