Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index 906a4bf4ceb01374897aa9ec16660c066d12b4ad..678acc176cf970477036b3d5debbd50dc7fd827f 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -136,6 +136,7 @@ |
| #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
| #include "content/renderer/pepper/pepper_webplugin_impl.h" |
| #include "content/renderer/pepper/plugin_module.h" |
| +#include "content/renderer/pepper/plugin_power_saver_helper.h" |
| #endif |
| #if defined(ENABLE_WEBRTC) |
| @@ -548,6 +549,9 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id) |
| is_swapped_out_(false), |
| render_frame_proxy_(NULL), |
| is_detaching_(false), |
| +#if defined(ENABLE_PLUGINS) |
| + plugin_power_saver_helper_(NULL), |
| +#endif |
| cookie_jar_(this), |
| selection_text_offset_(0), |
| selection_range_(gfx::Range::InvalidRange()), |
| @@ -580,10 +584,16 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id) |
| render_view_->RegisterRenderFrame(this); |
| +// Everything below are RenderFrameObservers are are automatically deleted |
|
Charlie Reis
2014/10/30 22:13:16
are -> and?
tommycli
2014/10/31 00:01:22
Edited the comment. See if that makes more sense.
|
| +// when the RenderFrame gets deleted. |
| #if defined(OS_ANDROID) |
| new GinJavaBridgeDispatcher(this); |
| #endif |
| +#if defined(ENABLE_PLUGINS) |
| + plugin_power_saver_helper_ = new PluginPowerSaverHelper(this); |
| +#endif |
| + |
| #if defined(ENABLE_NOTIFICATIONS) |
| notification_provider_ = new NotificationProvider(this); |
| #endif |
| @@ -813,6 +823,10 @@ void RenderFrameImpl::OnImeConfirmComposition( |
| pepper_composition_text_.clear(); |
| } |
| +PluginPowerSaverHelper* RenderFrameImpl::plugin_power_saver_helper() { |
| + DCHECK(plugin_power_saver_helper_); |
| + return plugin_power_saver_helper_; |
| +} |
| #endif // defined(ENABLE_PLUGINS) |
| MediaStreamDispatcher* RenderFrameImpl::GetMediaStreamDispatcher() { |