| 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 56565bdd1b56d261de0106968d5c143793c367c2..61b7a70bd6b3f92cced33a6cdc7e9b429461dcda 100644
|
| --- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
| +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
| @@ -110,7 +110,7 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin(
|
| const base::string16& name,
|
| int template_id,
|
| const base::string16& message,
|
| - const PlaceholderPosterInfo& poster_info) {
|
| + const PowerSaverInfo& power_saver_info) {
|
| base::DictionaryValue values;
|
| values.SetString("message", message);
|
| values.SetString("name", name);
|
| @@ -121,16 +121,17 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin(
|
| ? "document"
|
| : "embedded");
|
|
|
| - if (!poster_info.poster_attribute.empty()) {
|
| - values.SetString("poster", poster_info.poster_attribute);
|
| - values.SetString("baseurl", poster_info.base_url.spec());
|
| + if (!power_saver_info.poster_attribute.empty()) {
|
| + values.SetString("poster", power_saver_info.poster_attribute);
|
| + values.SetString("baseurl", power_saver_info.base_url.spec());
|
|
|
| - if (!poster_info.custom_poster_size.IsEmpty()) {
|
| + if (!power_saver_info.custom_poster_size.IsEmpty()) {
|
| float zoom_factor =
|
| blink::WebView::zoomLevelToZoomFactor(frame->view()->zoomLevel());
|
| - int width = roundf(poster_info.custom_poster_size.width() / zoom_factor);
|
| + int width =
|
| + roundf(power_saver_info.custom_poster_size.width() / zoom_factor);
|
| int height =
|
| - roundf(poster_info.custom_poster_size.height() / zoom_factor);
|
| + roundf(power_saver_info.custom_poster_size.height() / zoom_factor);
|
| values.SetString("visibleWidth", base::IntToString(width) + "px");
|
| values.SetString("visibleHeight", base::IntToString(height) + "px");
|
| }
|
| @@ -147,10 +148,15 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin(
|
| ChromePluginPlaceholder* blocked_plugin = new ChromePluginPlaceholder(
|
| render_frame, frame, params, html_data, name);
|
|
|
| - if (!poster_info.poster_attribute.empty())
|
| + if (!power_saver_info.poster_attribute.empty())
|
| blocked_plugin->BlockForPowerSaverPoster();
|
| blocked_plugin->SetPluginInfo(info);
|
| blocked_plugin->SetIdentifier(identifier);
|
| +
|
| + blocked_plugin->set_power_saver_enabled(power_saver_info.power_saver_enabled);
|
| + blocked_plugin->set_blocked_for_background_tab(
|
| + power_saver_info.blocked_for_background_tab);
|
| +
|
| return blocked_plugin;
|
| }
|
|
|
|
|