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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1341563002: Plugin Power Saver: Improve origin handling esp. with OOPIF. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index b42860a347326f73bf1a8c8600251accf5273585..7d4bfc6949b956792d853e5484d9028addddf58a 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -715,7 +715,7 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
is_detaching_(false),
proxy_routing_id_(MSG_ROUTING_NONE),
#if defined(ENABLE_PLUGINS)
- plugin_power_saver_helper_(NULL),
+ plugin_power_saver_helper_(nullptr),
#endif
cookie_jar_(this),
selection_text_offset_(0),
@@ -759,6 +759,7 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
#endif
#if defined(ENABLE_PLUGINS)
+ // Manages its own lifetime.
plugin_power_saver_helper_ = new PluginPowerSaverHelper(this);
#endif
@@ -1956,7 +1957,7 @@ ServiceRegistry* RenderFrameImpl::GetServiceRegistry() {
#if defined(ENABLE_PLUGINS)
void RenderFrameImpl::RegisterPeripheralPlugin(
- const GURL& content_origin,
+ const url::Origin& content_origin,
const base::Closure& unthrottle_callback) {
return plugin_power_saver_helper_->RegisterPeripheralPlugin(
content_origin, unthrottle_callback);
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698