Index: content/browser/frame_host/render_frame_host_impl.h |
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h |
index f3cb41893396f3cb016b96c41430fd0d26ca9e95..5cbb3584465025c734c63678ecf592ac84ef9678 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.h |
+++ b/content/browser/frame_host/render_frame_host_impl.h |
@@ -24,6 +24,7 @@ |
#include "content/browser/accessibility/browser_accessibility_manager.h" |
#include "content/browser/bad_message.h" |
#include "content/browser/loader/global_routing_id.h" |
+#include "content/browser/media/audio_output_impl.h" |
#include "content/browser/site_instance_impl.h" |
#include "content/browser/webui/web_ui_impl.h" |
#include "content/common/accessibility_mode_enums.h" |
@@ -70,7 +71,7 @@ class WebBluetoothService; |
} |
namespace content { |
- |
+class AudioOutputImpl; |
class CrossProcessFrameConnector; |
class CrossSiteTransferringRequest; |
class FrameMojoShell; |
@@ -116,6 +117,10 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost, |
~RenderFrameHostImpl() override; |
// RenderFrameHost |
+ AudioOutputImpl* GetAudioOutputImpl() override; |
+ |
+ void SetAudioOutputImpl(AudioOutputImpl* audio_output_impl) override; |
nasko
2016/05/25 20:50:41
No spaces between methods that are overriden.
rchtara
2016/05/27 15:24:38
Done.
|
+ |
int GetRoutingID() override; |
AXTreeIDRegistry::AXTreeID GetAXTreeID() override; |
SiteInstanceImpl* GetSiteInstance() override; |
@@ -764,6 +769,8 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost, |
// happen before it fires (to avoid flakiness). |
void DisableSwapOutTimerForTesting(); |
+ AudioOutputImpl* audio_output_impl_; |
nasko
2016/05/25 20:50:41
Add a comment on what this new member is.
rchtara
2016/05/27 15:24:38
Done.
|
+ |
// For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a |
// refcount that calls Shutdown when it reaches zero. This allows each |
// RenderFrameHostManager to just care about RenderFrameHosts, while ensuring |