Chromium Code Reviews| 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 388 | 388 |
| 389 DCHECK(!globals_); | 389 DCHECK(!globals_); |
| 390 globals_ = new Globals; | 390 globals_ = new Globals; |
| 391 | 391 |
| 392 // Add an observer that will emit network change events to the ChromeNetLog. | 392 // Add an observer that will emit network change events to the ChromeNetLog. |
| 393 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be | 393 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be |
| 394 // logging the network change before other IO thread consumers respond to it. | 394 // logging the network change before other IO thread consumers respond to it. |
| 395 network_change_observer_.reset( | 395 network_change_observer_.reset( |
| 396 new LoggingNetworkChangeObserver(net_log_)); | 396 new LoggingNetworkChangeObserver(net_log_)); |
| 397 | 397 |
| 398 // Setup the HistogramWatcher to run on the I/O thread. | |
|
szym
2012/08/08 20:41:17
maybe "IO thread" for consistency
pauljensen
2012/08/13 15:42:04
Done.
| |
| 399 net::NetworkChangeNotifier::InitHistogramWatcher(); | |
| 400 | |
| 398 globals_->extension_event_router_forwarder = | 401 globals_->extension_event_router_forwarder = |
| 399 extension_event_router_forwarder_; | 402 extension_event_router_forwarder_; |
| 400 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( | 403 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( |
| 401 extension_event_router_forwarder_, | 404 extension_event_router_forwarder_, |
| 402 NULL, | 405 NULL, |
| 403 NULL, | 406 NULL, |
| 404 NULL, | 407 NULL, |
| 405 NULL, | 408 NULL, |
| 406 &system_enable_referrers_, | 409 &system_enable_referrers_, |
| 407 NULL); | 410 NULL); |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 627 new net::HttpNetworkLayer( | 630 new net::HttpNetworkLayer( |
| 628 new net::HttpNetworkSession(system_params))); | 631 new net::HttpNetworkSession(system_params))); |
| 629 globals_->system_ftp_transaction_factory.reset( | 632 globals_->system_ftp_transaction_factory.reset( |
| 630 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 633 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 631 globals_->system_request_context.reset( | 634 globals_->system_request_context.reset( |
| 632 ConstructSystemRequestContext(globals_, net_log_)); | 635 ConstructSystemRequestContext(globals_, net_log_)); |
| 633 | 636 |
| 634 sdch_manager_->set_sdch_fetcher( | 637 sdch_manager_->set_sdch_fetcher( |
| 635 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 638 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
| 636 } | 639 } |
| OLD | NEW |