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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1930393002: Switch stream creation and closing in Chrome audio rendering from IPC to Mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixwindows Created 4 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 21 matching lines...) Expand all
32 #include "content/browser/frame_host/navigation_entry_impl.h" 32 #include "content/browser/frame_host/navigation_entry_impl.h"
33 #include "content/browser/frame_host/navigation_handle_impl.h" 33 #include "content/browser/frame_host/navigation_handle_impl.h"
34 #include "content/browser/frame_host/navigation_request.h" 34 #include "content/browser/frame_host/navigation_request.h"
35 #include "content/browser/frame_host/navigator.h" 35 #include "content/browser/frame_host/navigator.h"
36 #include "content/browser/frame_host/navigator_impl.h" 36 #include "content/browser/frame_host/navigator_impl.h"
37 #include "content/browser/frame_host/render_frame_host_delegate.h" 37 #include "content/browser/frame_host/render_frame_host_delegate.h"
38 #include "content/browser/frame_host/render_frame_proxy_host.h" 38 #include "content/browser/frame_host/render_frame_proxy_host.h"
39 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 39 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
40 #include "content/browser/geolocation/geolocation_service_context.h" 40 #include "content/browser/geolocation/geolocation_service_context.h"
41 #include "content/browser/loader/resource_dispatcher_host_impl.h" 41 #include "content/browser/loader/resource_dispatcher_host_impl.h"
42 #include "content/browser/media/audio_output_impl.h"
42 #include "content/browser/permissions/permission_service_context.h" 43 #include "content/browser/permissions/permission_service_context.h"
43 #include "content/browser/permissions/permission_service_impl.h" 44 #include "content/browser/permissions/permission_service_impl.h"
44 #include "content/browser/presentation/presentation_service_impl.h" 45 #include "content/browser/presentation/presentation_service_impl.h"
45 #include "content/browser/renderer_host/input/input_router_impl.h" 46 #include "content/browser/renderer_host/input/input_router_impl.h"
46 #include "content/browser/renderer_host/input/timeout_monitor.h" 47 #include "content/browser/renderer_host/input/timeout_monitor.h"
47 #include "content/browser/renderer_host/render_process_host_impl.h" 48 #include "content/browser/renderer_host/render_process_host_impl.h"
48 #include "content/browser/renderer_host/render_view_host_delegate.h" 49 #include "content/browser/renderer_host/render_view_host_delegate.h"
49 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 50 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
50 #include "content/browser/renderer_host/render_view_host_impl.h" 51 #include "content/browser/renderer_host/render_view_host_impl.h"
51 #include "content/browser/renderer_host/render_widget_host_delegate.h" 52 #include "content/browser/renderer_host/render_widget_host_delegate.h"
(...skipping 1954 matching lines...) Expand 10 before | Expand all | Expand 10 after
2006 base::Bind(&RenderFrameHostImpl::CreateWebBluetoothService, 2007 base::Bind(&RenderFrameHostImpl::CreateWebBluetoothService,
2007 base::Unretained(this))); 2008 base::Unretained(this)));
2008 } 2009 }
2009 2010
2010 if (!frame_mojo_shell_) 2011 if (!frame_mojo_shell_)
2011 frame_mojo_shell_.reset(new FrameMojoShell(this)); 2012 frame_mojo_shell_.reset(new FrameMojoShell(this));
2012 2013
2013 GetServiceRegistry()->AddService<shell::mojom::Connector>(base::Bind( 2014 GetServiceRegistry()->AddService<shell::mojom::Connector>(base::Bind(
2014 &FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get()))); 2015 &FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get())));
2015 2016
2017 GetServiceRegistry()->AddService(
2018 base::Bind(&AudioOutputImpl::CreateService, this));
2019
2016 #if defined(ENABLE_WEBVR) 2020 #if defined(ENABLE_WEBVR)
2017 const base::CommandLine& browser_command_line = 2021 const base::CommandLine& browser_command_line =
2018 *base::CommandLine::ForCurrentProcess(); 2022 *base::CommandLine::ForCurrentProcess();
2019 2023
2020 if (browser_command_line.HasSwitch(switches::kEnableWebVR)) { 2024 if (browser_command_line.HasSwitch(switches::kEnableWebVR)) {
2021 GetServiceRegistry()->AddService<blink::mojom::VRService>( 2025 GetServiceRegistry()->AddService<blink::mojom::VRService>(
2022 base::Bind(&VRDeviceManager::BindRequest)); 2026 base::Bind(&VRDeviceManager::BindRequest));
2023 } 2027 }
2024 #endif 2028 #endif
2025 2029
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
2849 // handler after it's destroyed so it can't run after the RFHI is destroyed. 2853 // handler after it's destroyed so it can't run after the RFHI is destroyed.
2850 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 2854 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
2851 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 2855 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
2852 } 2856 }
2853 2857
2854 void RenderFrameHostImpl::DeleteWebBluetoothService() { 2858 void RenderFrameHostImpl::DeleteWebBluetoothService() {
2855 web_bluetooth_service_.reset(); 2859 web_bluetooth_service_.reset();
2856 } 2860 }
2857 2861
2858 } // namespace content 2862 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/audio_output_impl.h » ('j') | content/browser/media/audio_output_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698