| OLD | NEW |
| 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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 net::NetworkChangeNotifier::AddIPAddressObserver(this); | 235 net::NetworkChangeNotifier::AddIPAddressObserver(this); |
| 236 } | 236 } |
| 237 | 237 |
| 238 ~LoggingNetworkChangeObserver() { | 238 ~LoggingNetworkChangeObserver() { |
| 239 net::NetworkChangeNotifier::RemoveIPAddressObserver(this); | 239 net::NetworkChangeNotifier::RemoveIPAddressObserver(this); |
| 240 } | 240 } |
| 241 | 241 |
| 242 virtual void OnIPAddressChanged() { | 242 virtual void OnIPAddressChanged() { |
| 243 VLOG(1) << "Observed a change to the network IP addresses"; | 243 VLOG(1) << "Observed a change to the network IP addresses"; |
| 244 | 244 |
| 245 net_log_->AddGlobalEntry(net::NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED, | 245 net_log_->AddGlobalEntry(net::NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED); |
| 246 NULL); | |
| 247 } | 246 } |
| 248 | 247 |
| 249 private: | 248 private: |
| 250 net::NetLog* net_log_; | 249 net::NetLog* net_log_; |
| 251 DISALLOW_COPY_AND_ASSIGN(LoggingNetworkChangeObserver); | 250 DISALLOW_COPY_AND_ASSIGN(LoggingNetworkChangeObserver); |
| 252 }; | 251 }; |
| 253 | 252 |
| 254 class SystemURLRequestContextGetter : public net::URLRequestContextGetter { | 253 class SystemURLRequestContextGetter : public net::URLRequestContextGetter { |
| 255 public: | 254 public: |
| 256 explicit SystemURLRequestContextGetter(IOThread* io_thread); | 255 explicit SystemURLRequestContextGetter(IOThread* io_thread); |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 new net::HttpNetworkLayer( | 623 new net::HttpNetworkLayer( |
| 625 new net::HttpNetworkSession(system_params))); | 624 new net::HttpNetworkSession(system_params))); |
| 626 globals_->system_ftp_transaction_factory.reset( | 625 globals_->system_ftp_transaction_factory.reset( |
| 627 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 626 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 628 globals_->system_request_context.reset( | 627 globals_->system_request_context.reset( |
| 629 ConstructSystemRequestContext(globals_, net_log_)); | 628 ConstructSystemRequestContext(globals_, net_log_)); |
| 630 | 629 |
| 631 sdch_manager_->set_sdch_fetcher( | 630 sdch_manager_->set_sdch_fetcher( |
| 632 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 631 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
| 633 } | 632 } |
| OLD | NEW |