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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2890753003: Introduce AudioIPCFactory. (Closed)
Patch Set: Rollback to PS1, fix includes. Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index a6ebbfb0c343a12bc3ba105dfb671119b23b8f48..f60da8d622a29544f08964b3191f0b4ae8bfa465 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -117,6 +117,7 @@
#include "content/renderer/internal_document_state_data.h"
#include "content/renderer/manifest/manifest_manager.h"
#include "content/renderer/media/audio_device_factory.h"
+#include "content/renderer/media/audio_ipc_factory.h"
#include "content/renderer/media/media_devices_listener_impl.h"
#include "content/renderer/media/media_permission_dispatcher.h"
#include "content/renderer/media/media_stream_dispatcher.h"
@@ -1222,6 +1223,9 @@ RenderFrameImpl::~RenderFrameImpl() {
if (input_handler_manager)
input_handler_manager->UnregisterRoutingID(GetRoutingID());
+ if (AudioIPCFactory::get())
DaleCurtis 2017/05/31 20:48:09 If you like, you can write this as: if (auto* fac
Max Morin 2017/06/01 13:58:43 Done.
+ AudioIPCFactory::get()->MaybeDeregisterRemoteFactory(GetRoutingID());
+
if (is_main_frame_) {
// Ensure the RenderView doesn't point to this object, once it is destroyed.
// TODO(nasko): Add a check that the |main_render_frame_| of |render_view_|
@@ -1295,6 +1299,12 @@ void RenderFrameImpl::Initialize() {
GetRoutingID(), render_view_->GetRoutingID());
}
+ // AudioIPCFactory may be null in tests.
+ if (AudioIPCFactory::get()) {
+ AudioIPCFactory::get()->MaybeRegisterRemoteFactory(GetRoutingID(),
+ GetRemoteInterfaces());
+ }
+
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kDomAutomationController))

Powered by Google App Engine
This is Rietveld 408576698