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

Unified Diff: chrome/renderer/plugins/chrome_plugin_placeholder.cc

Issue 1015023002: Plugin Power Saver: Throttle 'large' plugins that appear small. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « chrome/renderer/plugins/chrome_plugin_placeholder.h ('k') | chrome/renderer/plugins/plugin_preroller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/plugins/chrome_plugin_placeholder.cc
diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chrome/renderer/plugins/chrome_plugin_placeholder.cc
index c1788a3d2695e4085cdc40514894aea64a148b2c..862627c67455f30bdaf1d69e16d838c14edac3f6 100644
--- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc
+++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc
@@ -4,6 +4,7 @@
#include "chrome/renderer/plugins/chrome_plugin_placeholder.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/prerender_messages.h"
@@ -27,6 +28,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/webui/jstemplate_builder.h"
+#include "ui/gfx/geometry/size.h"
#include "url/url_util.h"
using base::UserMetricsAction;
@@ -143,16 +145,24 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin(
const base::string16& name,
int template_id,
const base::string16& message,
- const std::string& poster_attribute,
- const GURL& base_url) {
+ const PlaceholderPosterInfo& poster_info) {
base::DictionaryValue values;
values.SetString("message", message);
values.SetString("name", name);
values.SetString("hide", l10n_util::GetStringUTF8(IDS_PLUGIN_HIDE));
- if (!poster_attribute.empty()) {
- values.SetString("poster", poster_attribute);
- values.SetString("baseurl", base_url.spec());
+ if (!poster_info.poster_attribute.empty()) {
+ values.SetString("poster", poster_info.poster_attribute);
+ values.SetString("baseurl", poster_info.base_url.spec());
+
+ if (!poster_info.custom_poster_size.IsEmpty()) {
+ values.SetString(
+ "visibleWidth",
+ base::IntToString(poster_info.custom_poster_size.width()) + "px");
+ values.SetString(
+ "visibleHeight",
+ base::IntToString(poster_info.custom_poster_size.height()) + "px");
+ }
}
const base::StringPiece template_html(
@@ -167,7 +177,7 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin(
render_frame, frame, params, html_data, name);
#if defined(ENABLE_PLUGINS)
- if (!poster_attribute.empty())
+ if (!poster_info.poster_attribute.empty())
blocked_plugin->BlockForPowerSaverPoster();
#endif
blocked_plugin->SetPluginInfo(info);
« no previous file with comments | « chrome/renderer/plugins/chrome_plugin_placeholder.h ('k') | chrome/renderer/plugins/plugin_preroller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698