| 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 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 #if !defined(GOOGLE_CHROME_BUILD) || defined(OS_ANDROID) | 908 #if !defined(GOOGLE_CHROME_BUILD) || defined(OS_ANDROID) |
| 909 // Single-process is an unsupported and not fully tested mode, so | 909 // Single-process is an unsupported and not fully tested mode, so |
| 910 // don't enable it for official Chrome builds (except on Android). | 910 // don't enable it for official Chrome builds (except on Android). |
| 911 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) | 911 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) |
| 912 RenderProcessHost::SetRunRendererInProcess(true); | 912 RenderProcessHost::SetRunRendererInProcess(true); |
| 913 #endif | 913 #endif |
| 914 | 914 |
| 915 return result_code_; | 915 return result_code_; |
| 916 } | 916 } |
| 917 | 917 |
| 918 void BrowserMainLoop::PreShutdown() { |
| 919 parts_->PreShutdown(); |
| 920 } |
| 921 |
| 918 void BrowserMainLoop::CreateStartupTasks() { | 922 void BrowserMainLoop::CreateStartupTasks() { |
| 919 TRACE_EVENT0("startup", "BrowserMainLoop::CreateStartupTasks"); | 923 TRACE_EVENT0("startup", "BrowserMainLoop::CreateStartupTasks"); |
| 920 | 924 |
| 921 // First time through, we really want to create all the tasks | 925 // First time through, we really want to create all the tasks |
| 922 if (!startup_task_runner_.get()) { | 926 if (!startup_task_runner_.get()) { |
| 923 #if defined(OS_ANDROID) | 927 #if defined(OS_ANDROID) |
| 924 startup_task_runner_ = base::MakeUnique<StartupTaskRunner>( | 928 startup_task_runner_ = base::MakeUnique<StartupTaskRunner>( |
| 925 base::Bind(&BrowserStartupComplete), | 929 base::Bind(&BrowserStartupComplete), |
| 926 base::ThreadTaskRunnerHandle::Get()); | 930 base::ThreadTaskRunnerHandle::Get()); |
| 927 #else | 931 #else |
| (...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1780 if (!audio_manager_) { | 1784 if (!audio_manager_) { |
| 1781 audio_thread_ = base::MakeUnique<AudioManagerThread>(); | 1785 audio_thread_ = base::MakeUnique<AudioManagerThread>(); |
| 1782 audio_manager_ = media::AudioManager::Create( | 1786 audio_manager_ = media::AudioManager::Create( |
| 1783 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), | 1787 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), |
| 1784 MediaInternals::GetInstance()); | 1788 MediaInternals::GetInstance()); |
| 1785 } | 1789 } |
| 1786 CHECK(audio_manager_); | 1790 CHECK(audio_manager_); |
| 1787 } | 1791 } |
| 1788 | 1792 |
| 1789 } // namespace content | 1793 } // namespace content |
| OLD | NEW |