| 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 <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 919 // Running inside browser tests, which relies on synchronous start. | 919 // Running inside browser tests, which relies on synchronous start. |
| 920 startup_task_runner_->RunAllTasksNow(); | 920 startup_task_runner_->RunAllTasksNow(); |
| 921 } else { | 921 } else { |
| 922 startup_task_runner_->StartRunningTasksAsync(); | 922 startup_task_runner_->StartRunningTasksAsync(); |
| 923 } | 923 } |
| 924 #else | 924 #else |
| 925 startup_task_runner_->RunAllTasksNow(); | 925 startup_task_runner_->RunAllTasksNow(); |
| 926 #endif | 926 #endif |
| 927 } | 927 } |
| 928 | 928 |
| 929 gpu::GpuChannelEstablishFactory* |
| 930 BrowserMainLoop::gpu_channel_establish_factory() const { |
| 931 return BrowserGpuChannelHostFactory::instance(); |
| 932 } |
| 933 |
| 929 #if defined(OS_ANDROID) | 934 #if defined(OS_ANDROID) |
| 930 void BrowserMainLoop::SynchronouslyFlushStartupTasks() { | 935 void BrowserMainLoop::SynchronouslyFlushStartupTasks() { |
| 931 startup_task_runner_->RunAllTasksNow(); | 936 startup_task_runner_->RunAllTasksNow(); |
| 932 } | 937 } |
| 933 #endif // OS_ANDROID | 938 #endif // OS_ANDROID |
| 934 | 939 |
| 935 int BrowserMainLoop::CreateThreads() { | 940 int BrowserMainLoop::CreateThreads() { |
| 936 TRACE_EVENT0("startup,rail", "BrowserMainLoop::CreateThreads"); | 941 TRACE_EVENT0("startup,rail", "BrowserMainLoop::CreateThreads"); |
| 937 | 942 |
| 938 { | 943 { |
| (...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1774 base::MakeUnique<media::AudioThreadImpl>(), | 1779 base::MakeUnique<media::AudioThreadImpl>(), |
| 1775 MediaInternals::GetInstance()); | 1780 MediaInternals::GetInstance()); |
| 1776 } | 1781 } |
| 1777 CHECK(audio_manager_); | 1782 CHECK(audio_manager_); |
| 1778 | 1783 |
| 1779 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1784 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1780 CHECK(audio_system_); | 1785 CHECK(audio_system_); |
| 1781 } | 1786 } |
| 1782 | 1787 |
| 1783 } // namespace content | 1788 } // namespace content |
| OLD | NEW |