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 "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 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1199 | 1199 |
| 1200 if (RenderProcessHost::run_renderer_in_process()) | 1200 if (RenderProcessHost::run_renderer_in_process()) |
| 1201 RenderProcessHostImpl::ShutDownInProcessRenderer(); | 1201 RenderProcessHostImpl::ShutDownInProcessRenderer(); |
| 1202 | 1202 |
| 1203 if (parts_) { | 1203 if (parts_) { |
| 1204 TRACE_EVENT0("shutdown", | 1204 TRACE_EVENT0("shutdown", |
| 1205 "BrowserMainLoop::Subsystem:PostMainMessageLoopRun"); | 1205 "BrowserMainLoop::Subsystem:PostMainMessageLoopRun"); |
| 1206 parts_->PostMainMessageLoopRun(); | 1206 parts_->PostMainMessageLoopRun(); |
| 1207 } | 1207 } |
| 1208 | 1208 |
| 1209 #if defined(USE_AURA) | |
| 1210 env_.reset(); | |
|
msw
2016/12/21 17:56:35
aura::Env doesn't have any deps on objects explici
sadrul
2016/12/21 18:03:36
Yep. I will keep an eye on it (the trybots seem ha
| |
| 1211 #endif | |
| 1212 | |
| 1213 system_stats_monitor_.reset(); | 1209 system_stats_monitor_.reset(); |
| 1214 | 1210 |
| 1215 // Destroying the GpuProcessHostUIShims on the UI thread posts a task to | 1211 // Destroying the GpuProcessHostUIShims on the UI thread posts a task to |
| 1216 // delete related objects on the GPU thread. This must be done before | 1212 // delete related objects on the GPU thread. This must be done before |
| 1217 // stopping the GPU thread. The GPU thread will close IPC channels to renderer | 1213 // stopping the GPU thread. The GPU thread will close IPC channels to renderer |
| 1218 // processes so this has to happen before stopping the IO thread. | 1214 // processes so this has to happen before stopping the IO thread. |
| 1219 { | 1215 { |
| 1220 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GPUProcessHostShim"); | 1216 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GPUProcessHostShim"); |
| 1221 GpuProcessHostUIShim::DestroyAll(); | 1217 GpuProcessHostUIShim::DestroyAll(); |
| 1222 } | 1218 } |
| (...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1793 if (!audio_manager_) { | 1789 if (!audio_manager_) { |
| 1794 audio_thread_ = base::MakeUnique<AudioManagerThread>(); | 1790 audio_thread_ = base::MakeUnique<AudioManagerThread>(); |
| 1795 audio_manager_ = media::AudioManager::Create( | 1791 audio_manager_ = media::AudioManager::Create( |
| 1796 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), | 1792 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), |
| 1797 MediaInternals::GetInstance()); | 1793 MediaInternals::GetInstance()); |
| 1798 } | 1794 } |
| 1799 CHECK(audio_manager_); | 1795 CHECK(audio_manager_); |
| 1800 } | 1796 } |
| 1801 | 1797 |
| 1802 } // namespace content | 1798 } // namespace content |
| OLD | NEW |