| 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 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1529 GetContentClient()->browser()->ResourceDispatcherHostCreated(); | 1529 GetContentClient()->browser()->ResourceDispatcherHostCreated(); |
| 1530 | 1530 |
| 1531 loader_delegate_.reset(new LoaderDelegateImpl()); | 1531 loader_delegate_.reset(new LoaderDelegateImpl()); |
| 1532 resource_dispatcher_host_->SetLoaderDelegate(loader_delegate_.get()); | 1532 resource_dispatcher_host_->SetLoaderDelegate(loader_delegate_.get()); |
| 1533 } | 1533 } |
| 1534 | 1534 |
| 1535 // MediaStreamManager needs the IO thread to be created. | 1535 // MediaStreamManager needs the IO thread to be created. |
| 1536 { | 1536 { |
| 1537 TRACE_EVENT0("startup", | 1537 TRACE_EVENT0("startup", |
| 1538 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); | 1538 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); |
| 1539 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); | 1539 media_stream_manager_.reset(new MediaStreamManager(audio_system_.get())); |
| 1540 } | 1540 } |
| 1541 | 1541 |
| 1542 { | 1542 { |
| 1543 TRACE_EVENT0("startup", | 1543 TRACE_EVENT0("startup", |
| 1544 "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition"); | 1544 "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition"); |
| 1545 speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl( | 1545 speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl( |
| 1546 audio_system_.get(), media_stream_manager_.get())); | 1546 audio_system_.get(), media_stream_manager_.get())); |
| 1547 } | 1547 } |
| 1548 | 1548 |
| 1549 { | 1549 { |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1792 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 1792 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
| 1793 MediaInternals::GetInstance()); | 1793 MediaInternals::GetInstance()); |
| 1794 } | 1794 } |
| 1795 CHECK(audio_manager_); | 1795 CHECK(audio_manager_); |
| 1796 | 1796 |
| 1797 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1797 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1798 CHECK(audio_system_); | 1798 CHECK(audio_system_); |
| 1799 } | 1799 } |
| 1800 | 1800 |
| 1801 } // namespace content | 1801 } // namespace content |
| OLD | NEW |