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 1676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1687 // Disallow mojo sync calls in the browser process. Note that we allow sync | 1687 // Disallow mojo sync calls in the browser process. Note that we allow sync |
1688 // calls in single-process mode since renderer IPCs are made from a browser | 1688 // calls in single-process mode since renderer IPCs are made from a browser |
1689 // thread. | 1689 // thread. |
1690 bool sync_call_allowed = false; | 1690 bool sync_call_allowed = false; |
1691 MojoResult result = mojo::edk::SetProperty( | 1691 MojoResult result = mojo::edk::SetProperty( |
1692 MOJO_PROPERTY_TYPE_SYNC_CALL_ALLOWED, &sync_call_allowed); | 1692 MOJO_PROPERTY_TYPE_SYNC_CALL_ALLOWED, &sync_call_allowed); |
1693 DCHECK_EQ(MOJO_RESULT_OK, result); | 1693 DCHECK_EQ(MOJO_RESULT_OK, result); |
1694 } | 1694 } |
1695 | 1695 |
1696 mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport( | 1696 mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport( |
1697 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))); | 1697 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), |
| 1698 mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST)); |
1698 | 1699 |
1699 service_manager_context_.reset(new ServiceManagerContext); | 1700 service_manager_context_.reset(new ServiceManagerContext); |
1700 #if defined(OS_MACOSX) | 1701 #if defined(OS_MACOSX) |
1701 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); | 1702 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); |
1702 #endif // defined(OS_MACOSX) | 1703 #endif // defined(OS_MACOSX) |
1703 if (parts_) { | 1704 if (parts_) { |
1704 parts_->ServiceManagerConnectionStarted( | 1705 parts_->ServiceManagerConnectionStarted( |
1705 ServiceManagerConnection::GetForProcess()); | 1706 ServiceManagerConnection::GetForProcess()); |
1706 } | 1707 } |
1707 } | 1708 } |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1781 if (!audio_manager_) { | 1782 if (!audio_manager_) { |
1782 audio_thread_ = base::MakeUnique<AudioManagerThread>(); | 1783 audio_thread_ = base::MakeUnique<AudioManagerThread>(); |
1783 audio_manager_ = media::AudioManager::Create( | 1784 audio_manager_ = media::AudioManager::Create( |
1784 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), | 1785 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), |
1785 MediaInternals::GetInstance()); | 1786 MediaInternals::GetInstance()); |
1786 } | 1787 } |
1787 CHECK(audio_manager_); | 1788 CHECK(audio_manager_); |
1788 } | 1789 } |
1789 | 1790 |
1790 } // namespace content | 1791 } // namespace content |
OLD | NEW |