| 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 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1527 // MediaStreamManager needs the IO thread to be created. | 1527 // MediaStreamManager needs the IO thread to be created. |
| 1528 { | 1528 { |
| 1529 TRACE_EVENT0("startup", | 1529 TRACE_EVENT0("startup", |
| 1530 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); | 1530 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); |
| 1531 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); | 1531 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); |
| 1532 } | 1532 } |
| 1533 | 1533 |
| 1534 { | 1534 { |
| 1535 TRACE_EVENT0("startup", | 1535 TRACE_EVENT0("startup", |
| 1536 "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition"); | 1536 "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition"); |
| 1537 speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl( | 1537 speech_recognition_manager_.reset( |
| 1538 audio_manager_.get(), media_stream_manager_.get())); | 1538 new SpeechRecognitionManagerImpl(media_stream_manager_.get())); |
| 1539 } | 1539 } |
| 1540 | 1540 |
| 1541 { | 1541 { |
| 1542 TRACE_EVENT0( | 1542 TRACE_EVENT0( |
| 1543 "startup", | 1543 "startup", |
| 1544 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor"); | 1544 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor"); |
| 1545 user_input_monitor_ = media::UserInputMonitor::Create( | 1545 user_input_monitor_ = media::UserInputMonitor::Create( |
| 1546 io_thread_->task_runner(), main_thread_->task_runner()); | 1546 io_thread_->task_runner(), main_thread_->task_runner()); |
| 1547 } | 1547 } |
| 1548 | 1548 |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1790 if (!audio_manager_) { | 1790 if (!audio_manager_) { |
| 1791 audio_thread_ = base::MakeUnique<AudioManagerThread>(); | 1791 audio_thread_ = base::MakeUnique<AudioManagerThread>(); |
| 1792 audio_manager_ = media::AudioManager::Create( | 1792 audio_manager_ = media::AudioManager::Create( |
| 1793 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), | 1793 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), |
| 1794 MediaInternals::GetInstance()); | 1794 MediaInternals::GetInstance()); |
| 1795 } | 1795 } |
| 1796 CHECK(audio_manager_); | 1796 CHECK(audio_manager_); |
| 1797 } | 1797 } |
| 1798 | 1798 |
| 1799 } // namespace content | 1799 } // namespace content |
| OLD | NEW |