| 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 "content/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 #endif | 1033 #endif |
| 1034 | 1034 |
| 1035 #if defined(USE_AURA) || defined(OS_MACOSX) | 1035 #if defined(USE_AURA) || defined(OS_MACOSX) |
| 1036 { | 1036 { |
| 1037 TRACE_EVENT0("shutdown", | 1037 TRACE_EVENT0("shutdown", |
| 1038 "BrowserMainLoop::Subsystem:ImageTransportFactory"); | 1038 "BrowserMainLoop::Subsystem:ImageTransportFactory"); |
| 1039 ImageTransportFactory::Terminate(); | 1039 ImageTransportFactory::Terminate(); |
| 1040 } | 1040 } |
| 1041 #endif | 1041 #endif |
| 1042 | 1042 |
| 1043 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) | |
| 1044 ZygoteHostImpl::GetInstance()->TearDownAfterLastChild(); | |
| 1045 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) | |
| 1046 | |
| 1047 // The device monitors are using |system_monitor_| as dependency, so delete | 1043 // The device monitors are using |system_monitor_| as dependency, so delete |
| 1048 // them before |system_monitor_| goes away. | 1044 // them before |system_monitor_| goes away. |
| 1049 // On Mac and windows, the monitor needs to be destroyed on the same thread | 1045 // On Mac and windows, the monitor needs to be destroyed on the same thread |
| 1050 // as they were created. On Linux, the monitor will be deleted when IO thread | 1046 // as they were created. On Linux, the monitor will be deleted when IO thread |
| 1051 // goes away. | 1047 // goes away. |
| 1052 #if defined(OS_WIN) | 1048 #if defined(OS_WIN) |
| 1053 system_message_window_.reset(); | 1049 system_message_window_.reset(); |
| 1054 #elif defined(OS_MACOSX) | 1050 #elif defined(OS_MACOSX) |
| 1055 device_monitor_mac_.reset(); | 1051 device_monitor_mac_.reset(); |
| 1056 #endif | 1052 #endif |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1479 DCHECK(is_tracing_startup_for_duration_); | 1475 DCHECK(is_tracing_startup_for_duration_); |
| 1480 | 1476 |
| 1481 is_tracing_startup_for_duration_ = false; | 1477 is_tracing_startup_for_duration_ = false; |
| 1482 TracingController::GetInstance()->StopTracing( | 1478 TracingController::GetInstance()->StopTracing( |
| 1483 TracingController::CreateFileSink( | 1479 TracingController::CreateFileSink( |
| 1484 startup_trace_file_, | 1480 startup_trace_file_, |
| 1485 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1481 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
| 1486 } | 1482 } |
| 1487 | 1483 |
| 1488 } // namespace content | 1484 } // namespace content |
| OLD | NEW |