OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chromecast/browser/cast_browser_main_parts.h" | 5 #include "chromecast/browser/cast_browser_main_parts.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <string.h> | 8 #include <string.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 metrics::RegisterPrefs(pref_registry.get()); | 426 metrics::RegisterPrefs(pref_registry.get()); |
427 cast_browser_process_->SetPrefService( | 427 cast_browser_process_->SetPrefService( |
428 PrefServiceHelper::CreatePrefService(pref_registry.get())); | 428 PrefServiceHelper::CreatePrefService(pref_registry.get())); |
429 | 429 |
430 #if !defined(OS_ANDROID) | 430 #if !defined(OS_ANDROID) |
431 memory_pressure_monitor_.reset(new CastMemoryPressureMonitor()); | 431 memory_pressure_monitor_.reset(new CastMemoryPressureMonitor()); |
432 #endif // defined(OS_ANDROID) | 432 #endif // defined(OS_ANDROID) |
433 | 433 |
434 cast_browser_process_->SetConnectivityChecker(ConnectivityChecker::Create( | 434 cast_browser_process_->SetConnectivityChecker(ConnectivityChecker::Create( |
435 content::BrowserThread::GetTaskRunnerForThread( | 435 content::BrowserThread::GetTaskRunnerForThread( |
436 content::BrowserThread::IO))); | 436 content::BrowserThread::IO), |
| 437 *cast_browser_process_->proxy_config())); |
437 | 438 |
438 cast_browser_process_->SetNetLog(net_log_.get()); | 439 cast_browser_process_->SetNetLog(net_log_.get()); |
439 | 440 |
440 url_request_context_factory_->InitializeOnUIThread(net_log_.get()); | 441 url_request_context_factory_->InitializeOnUIThread(net_log_.get()); |
441 | 442 |
442 cast_browser_process_->SetBrowserContext( | 443 cast_browser_process_->SetBrowserContext( |
443 base::MakeUnique<CastBrowserContext>(url_request_context_factory_)); | 444 base::MakeUnique<CastBrowserContext>(url_request_context_factory_)); |
444 cast_browser_process_->SetMetricsServiceClient( | 445 cast_browser_process_->SetMetricsServiceClient( |
445 metrics::CastMetricsServiceClient::Create( | 446 metrics::CastMetricsServiceClient::Create( |
446 content::BrowserThread::GetBlockingPool(), | 447 content::BrowserThread::GetBlockingPool(), |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 | 542 |
542 void CastBrowserMainParts::PostDestroyThreads() { | 543 void CastBrowserMainParts::PostDestroyThreads() { |
543 #if !defined(OS_ANDROID) | 544 #if !defined(OS_ANDROID) |
544 media_resource_tracker_->FinalizeAndDestroy(); | 545 media_resource_tracker_->FinalizeAndDestroy(); |
545 media_resource_tracker_ = nullptr; | 546 media_resource_tracker_ = nullptr; |
546 #endif | 547 #endif |
547 } | 548 } |
548 | 549 |
549 } // namespace shell | 550 } // namespace shell |
550 } // namespace chromecast | 551 } // namespace chromecast |
OLD | NEW |