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 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1534 { | 1534 { |
1535 TRACE_EVENT0("startup", | 1535 TRACE_EVENT0("startup", |
1536 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); | 1536 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); |
1537 media_stream_manager_.reset(new MediaStreamManager(audio_system_.get())); | 1537 media_stream_manager_.reset(new MediaStreamManager(audio_system_.get())); |
1538 } | 1538 } |
1539 | 1539 |
1540 { | 1540 { |
1541 TRACE_EVENT0("startup", | 1541 TRACE_EVENT0("startup", |
1542 "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition"); | 1542 "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition"); |
1543 speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl( | 1543 speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl( |
1544 audio_system_.get(), media_stream_manager_.get())); | 1544 audio_system_.get(), audio_manager_.get(), |
| 1545 media_stream_manager_.get())); |
1545 } | 1546 } |
1546 | 1547 |
1547 { | 1548 { |
1548 TRACE_EVENT0( | 1549 TRACE_EVENT0( |
1549 "startup", | 1550 "startup", |
1550 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor"); | 1551 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor"); |
1551 user_input_monitor_ = media::UserInputMonitor::Create( | 1552 user_input_monitor_ = media::UserInputMonitor::Create( |
1552 io_thread_->task_runner(), main_thread_->task_runner()); | 1553 io_thread_->task_runner(), main_thread_->task_runner()); |
1553 } | 1554 } |
1554 | 1555 |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1790 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 1791 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
1791 MediaInternals::GetInstance()); | 1792 MediaInternals::GetInstance()); |
1792 } | 1793 } |
1793 CHECK(audio_manager_); | 1794 CHECK(audio_manager_); |
1794 | 1795 |
1795 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1796 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
1796 CHECK(audio_system_); | 1797 CHECK(audio_system_); |
1797 } | 1798 } |
1798 | 1799 |
1799 } // namespace content | 1800 } // namespace content |
OLD | NEW |