Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2787703004: [Mojo Video Capture] Fix VideoCaptureManager exposing implementation details to clients (Closed)
Patch Set: Pull changes from upstream Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 GetContentClient()->browser()->ResourceDispatcherHostCreated(); 1509 GetContentClient()->browser()->ResourceDispatcherHostCreated();
1510 1510
1511 loader_delegate_.reset(new LoaderDelegateImpl()); 1511 loader_delegate_.reset(new LoaderDelegateImpl());
1512 resource_dispatcher_host_->SetLoaderDelegate(loader_delegate_.get()); 1512 resource_dispatcher_host_->SetLoaderDelegate(loader_delegate_.get());
1513 } 1513 }
1514 1514
1515 // MediaStreamManager needs the IO thread to be created. 1515 // MediaStreamManager needs the IO thread to be created.
1516 { 1516 {
1517 TRACE_EVENT0("startup", 1517 TRACE_EVENT0("startup",
1518 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); 1518 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager");
1519 media_stream_manager_.reset(new MediaStreamManager(audio_system_.get())); 1519 media_stream_manager_ =
1520 MediaStreamManager::CreateWithDefaults(audio_system_.get());
1520 } 1521 }
1521 1522
1522 { 1523 {
1523 TRACE_EVENT0("startup", 1524 TRACE_EVENT0("startup",
1524 "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition"); 1525 "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition");
1525 speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl( 1526 speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl(
1526 audio_system_.get(), audio_manager_.get(), 1527 audio_system_.get(), audio_manager_.get(),
1527 media_stream_manager_.get())); 1528 media_stream_manager_.get()));
1528 } 1529 }
1529 1530
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1773 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 1774 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
1774 MediaInternals::GetInstance()); 1775 MediaInternals::GetInstance());
1775 } 1776 }
1776 CHECK(audio_manager_); 1777 CHECK(audio_manager_);
1777 1778
1778 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); 1779 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
1779 CHECK(audio_system_); 1780 CHECK(audio_system_);
1780 } 1781 }
1781 1782
1782 } // namespace content 1783 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698