| 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 <string> | 7 #include <string> |
| 8 #if !defined(OS_ANDROID) | 8 #if !defined(OS_ANDROID) |
| 9 #include <signal.h> | 9 #include <signal.h> |
| 10 #include <sys/prctl.h> | 10 #include <sys/prctl.h> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "media/base/media_switches.h" | 43 #include "media/base/media_switches.h" |
| 44 | 44 |
| 45 #if defined(OS_ANDROID) | 45 #if defined(OS_ANDROID) |
| 46 #include "chromecast/browser/media/cast_media_client_android.h" | 46 #include "chromecast/browser/media/cast_media_client_android.h" |
| 47 #include "chromecast/crash/android/crash_handler.h" | 47 #include "chromecast/crash/android/crash_handler.h" |
| 48 #include "components/crash/browser/crash_dump_manager_android.h" | 48 #include "components/crash/browser/crash_dump_manager_android.h" |
| 49 #include "media/base/android/media_client_android.h" | 49 #include "media/base/android/media_client_android.h" |
| 50 #include "net/android/network_change_notifier_factory_android.h" | 50 #include "net/android/network_change_notifier_factory_android.h" |
| 51 #else | 51 #else |
| 52 #include "chromecast/browser/media/cast_browser_cdm_factory.h" | 52 #include "chromecast/browser/media/cast_browser_cdm_factory.h" |
| 53 #include "chromecast/net/network_change_notifier_factory_cast.h" | |
| 54 #endif | 53 #endif |
| 55 | 54 |
| 56 #if defined(USE_AURA) | 55 #if defined(USE_AURA) |
| 57 #include "ui/aura/test/test_screen.h" | 56 #include "ui/aura/test/test_screen.h" |
| 58 #include "ui/gfx/screen.h" | 57 #include "ui/gfx/screen.h" |
| 59 #endif | 58 #endif |
| 60 | 59 |
| 61 namespace { | 60 namespace { |
| 62 | 61 |
| 63 #if !defined(OS_ANDROID) | 62 #if !defined(OS_ANDROID) |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 // Net/DNS metrics. | 220 // Net/DNS metrics. |
| 222 metrics::PreregisterAllGroupedHistograms(); | 221 metrics::PreregisterAllGroupedHistograms(); |
| 223 | 222 |
| 224 // Set the platform's implementation of AudioManagerFactory. | 223 // Set the platform's implementation of AudioManagerFactory. |
| 225 if (audio_manager_factory_) | 224 if (audio_manager_factory_) |
| 226 ::media::AudioManager::SetFactory(audio_manager_factory_.release()); | 225 ::media::AudioManager::SetFactory(audio_manager_factory_.release()); |
| 227 | 226 |
| 228 #if defined(OS_ANDROID) | 227 #if defined(OS_ANDROID) |
| 229 net::NetworkChangeNotifier::SetFactory( | 228 net::NetworkChangeNotifier::SetFactory( |
| 230 new net::NetworkChangeNotifierFactoryAndroid()); | 229 new net::NetworkChangeNotifierFactoryAndroid()); |
| 231 #else | |
| 232 net::NetworkChangeNotifier::SetFactory( | |
| 233 new NetworkChangeNotifierFactoryCast()); | |
| 234 #endif // defined(OS_ANDROID) | 230 #endif // defined(OS_ANDROID) |
| 235 } | 231 } |
| 236 | 232 |
| 237 void CastBrowserMainParts::PostMainMessageLoopStart() { | 233 void CastBrowserMainParts::PostMainMessageLoopStart() { |
| 238 cast_browser_process_->SetMetricsHelper(make_scoped_ptr( | 234 cast_browser_process_->SetMetricsHelper(make_scoped_ptr( |
| 239 new metrics::CastMetricsHelper(base::MessageLoopProxy::current()))); | 235 new metrics::CastMetricsHelper(base::MessageLoopProxy::current()))); |
| 240 | 236 |
| 241 #if defined(OS_ANDROID) | 237 #if defined(OS_ANDROID) |
| 242 base::MessageLoopForUI::current()->Start(); | 238 base::MessageLoopForUI::current()->Start(); |
| 243 #endif // defined(OS_ANDROID) | 239 #endif // defined(OS_ANDROID) |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 #else | 365 #else |
| 370 cast_browser_process_->cast_service()->Finalize(); | 366 cast_browser_process_->cast_service()->Finalize(); |
| 371 cast_browser_process_->metrics_service_client()->Finalize(); | 367 cast_browser_process_->metrics_service_client()->Finalize(); |
| 372 cast_browser_process_.reset(); | 368 cast_browser_process_.reset(); |
| 373 DeregisterKillOnAlarm(); | 369 DeregisterKillOnAlarm(); |
| 374 #endif | 370 #endif |
| 375 } | 371 } |
| 376 | 372 |
| 377 } // namespace shell | 373 } // namespace shell |
| 378 } // namespace chromecast | 374 } // namespace chromecast |
| OLD | NEW |