| 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 6bb6bd2e7366a0febe5f8fbfea6faa04bee8a272..2a8101a5d7bafb79cb9c18150296e40f8ba1664b 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;
|
| @@ -154,7 +156,8 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin(
|
| int template_id,
|
| const base::string16& message,
|
| const std::string& poster_attribute,
|
| - const GURL& base_url) {
|
| + const GURL& base_url,
|
| + const gfx::Size& custom_poster_size) {
|
| base::DictionaryValue values;
|
| values.SetString("message", message);
|
| values.SetString("name", name);
|
| @@ -163,6 +166,13 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin(
|
| if (!poster_attribute.empty()) {
|
| values.SetString("poster", poster_attribute);
|
| values.SetString("baseurl", base_url.spec());
|
| +
|
| + if (!custom_poster_size.IsEmpty()) {
|
| + values.SetString("visibleWidth",
|
| + base::Int64ToString(custom_poster_size.width()) + "px");
|
| + values.SetString("visibleHeight",
|
| + base::Int64ToString(custom_poster_size.height()) + "px");
|
| + }
|
| }
|
|
|
| const base::StringPiece template_html(
|
|
|