| Index: chrome/renderer/plugins/plugin_placeholder.cc
|
| diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc
|
| index e87bbea904885b493517509f2dfb240616c303c4..145e31507e87ead63ffe5290c119dff91bf73f22 100644
|
| --- a/chrome/renderer/plugins/plugin_placeholder.cc
|
| +++ b/chrome/renderer/plugins/plugin_placeholder.cc
|
| @@ -38,6 +38,7 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/base/resource/resource_handle.h"
|
| #include "webkit/glue/webpreferences.h"
|
| #include "webkit/plugins/npapi/plugin_group.h"
|
| #include "webkit/plugins/npapi/plugin_list.h"
|
| @@ -101,7 +102,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin(
|
| const WebPluginParams& params) {
|
| const base::StringPiece template_html(
|
| ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| - IDR_BLOCKED_PLUGIN_HTML));
|
| + IDR_BLOCKED_PLUGIN_HTML, ui::ResourceHandle::kScaleFactorNone));
|
|
|
| DictionaryValue values;
|
| values.SetString("message", l10n_util::GetStringUTF8(IDS_PLUGIN_SEARCHING));
|
| @@ -132,7 +133,7 @@ PluginPlaceholder* PluginPlaceholder::CreateErrorPlugin(
|
|
|
| const base::StringPiece template_html(
|
| ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| - IDR_BLOCKED_PLUGIN_HTML));
|
| + IDR_BLOCKED_PLUGIN_HTML, ui::ResourceHandle::kScaleFactorNone));
|
| std::string html_data =
|
| jstemplate_builder::GetI18nTemplateHtml(template_html, &values);
|
|
|
| @@ -162,7 +163,8 @@ PluginPlaceholder* PluginPlaceholder::CreateBlockedPlugin(
|
| values.SetString("hide", l10n_util::GetStringUTF8(IDS_PLUGIN_HIDE));
|
|
|
| const base::StringPiece template_html(
|
| - ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
|
| + ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| + template_id, ui::ResourceHandle::kScaleFactorNone));
|
|
|
| DCHECK(!template_html.empty()) << "unable to load template. ID: "
|
| << template_id;
|
| @@ -185,7 +187,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMobileYoutubePlugin(
|
| const WebPluginParams& params) {
|
| const base::StringPiece template_html(
|
| ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| - IDR_YOUTUBE_PLUGIN_HTML));
|
| + IDR_YOUTUBE_PLUGIN_HTML, ui::ResourceHandle::kScaleFactorNone));
|
|
|
| DictionaryValue values;
|
| values.SetString("video_id", GetYoutubeVideoId(params));
|
|
|