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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 11413078: Tab Audio Capture: Browser-side connect/disconnect functionality. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed tommi's comments (dependency injection for testing AudioMirroringManager). Created 7 years, 12 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 | Annotate | Revision Log
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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "content/browser/loader/resource_message_filter.h" 59 #include "content/browser/loader/resource_message_filter.h"
60 #include "content/browser/mime_registry_message_filter.h" 60 #include "content/browser/mime_registry_message_filter.h"
61 #include "content/browser/plugin_service_impl.h" 61 #include "content/browser/plugin_service_impl.h"
62 #include "content/browser/profiler_message_filter.h" 62 #include "content/browser/profiler_message_filter.h"
63 #include "content/browser/renderer_host/clipboard_message_filter.h" 63 #include "content/browser/renderer_host/clipboard_message_filter.h"
64 #include "content/browser/renderer_host/database_message_filter.h" 64 #include "content/browser/renderer_host/database_message_filter.h"
65 #include "content/browser/renderer_host/file_utilities_message_filter.h" 65 #include "content/browser/renderer_host/file_utilities_message_filter.h"
66 #include "content/browser/renderer_host/gamepad_browser_message_filter.h" 66 #include "content/browser/renderer_host/gamepad_browser_message_filter.h"
67 #include "content/browser/renderer_host/gpu_message_filter.h" 67 #include "content/browser/renderer_host/gpu_message_filter.h"
68 #include "content/browser/renderer_host/media/audio_input_renderer_host.h" 68 #include "content/browser/renderer_host/media/audio_input_renderer_host.h"
69 #include "content/browser/renderer_host/media/audio_mirroring_manager.h"
69 #include "content/browser/renderer_host/media/audio_renderer_host.h" 70 #include "content/browser/renderer_host/media/audio_renderer_host.h"
70 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" 71 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
71 #include "content/browser/renderer_host/media/video_capture_host.h" 72 #include "content/browser/renderer_host/media/video_capture_host.h"
72 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" 73 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
73 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" 74 #include "content/browser/renderer_host/pepper/pepper_message_filter.h"
74 #include "content/browser/renderer_host/quota_dispatcher_host.h" 75 #include "content/browser/renderer_host/quota_dispatcher_host.h"
75 #include "content/browser/renderer_host/render_message_filter.h" 76 #include "content/browser/renderer_host/render_message_filter.h"
76 #include "content/browser/renderer_host/render_view_host_delegate.h" 77 #include "content/browser/renderer_host/render_view_host_delegate.h"
77 #include "content/browser/renderer_host/render_view_host_impl.h" 78 #include "content/browser/renderer_host/render_view_host_impl.h"
78 #include "content/browser/renderer_host/render_widget_helper.h" 79 #include "content/browser/renderer_host/render_widget_helper.h"
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 storage_partition_impl_->GetAppCacheService(), 510 storage_partition_impl_->GetAppCacheService(),
510 ChromeBlobStorageContext::GetFor(browser_context), 511 ChromeBlobStorageContext::GetFor(browser_context),
511 new RendererURLRequestContextSelector(browser_context, GetID())); 512 new RendererURLRequestContextSelector(browser_context, GetID()));
512 513
513 channel_->AddFilter(resource_message_filter); 514 channel_->AddFilter(resource_message_filter);
514 media::AudioManager* audio_manager = BrowserMainLoop::GetAudioManager(); 515 media::AudioManager* audio_manager = BrowserMainLoop::GetAudioManager();
515 MediaStreamManager* media_stream_manager = 516 MediaStreamManager* media_stream_manager =
516 BrowserMainLoop::GetMediaStreamManager(); 517 BrowserMainLoop::GetMediaStreamManager();
517 channel_->AddFilter(new AudioInputRendererHost(audio_manager, 518 channel_->AddFilter(new AudioInputRendererHost(audio_manager,
518 media_stream_manager)); 519 media_stream_manager));
519 channel_->AddFilter(new AudioRendererHost(audio_manager, media_observer)); 520 channel_->AddFilter(new AudioRendererHost(
521 GetID(), audio_manager, AudioMirroringManager::GetInstance(),
522 media_observer));
520 channel_->AddFilter(new VideoCaptureHost()); 523 channel_->AddFilter(new VideoCaptureHost());
521 channel_->AddFilter(new AppCacheDispatcherHost( 524 channel_->AddFilter(new AppCacheDispatcherHost(
522 storage_partition_impl_->GetAppCacheService(), 525 storage_partition_impl_->GetAppCacheService(),
523 GetID())); 526 GetID()));
524 channel_->AddFilter(new ClipboardMessageFilter()); 527 channel_->AddFilter(new ClipboardMessageFilter());
525 channel_->AddFilter( 528 channel_->AddFilter(
526 new DOMStorageMessageFilter( 529 new DOMStorageMessageFilter(
527 GetID(), 530 GetID(),
528 storage_partition_impl_->GetDOMStorageContext())); 531 storage_partition_impl_->GetDOMStorageContext()));
529 channel_->AddFilter( 532 channel_->AddFilter(
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1589 int32 gpu_process_host_id) { 1592 int32 gpu_process_host_id) {
1590 TRACE_EVENT0("renderer_host", 1593 TRACE_EVENT0("renderer_host",
1591 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1594 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1592 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1595 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1593 gpu_process_host_id, 1596 gpu_process_host_id,
1594 surface_handle, 1597 surface_handle,
1595 0); 1598 0);
1596 } 1599 }
1597 1600
1598 } // namespace content 1601 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698