diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:52:25 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:52:25 +0000 |
| commit | 3ac5867cfe9d931a65d56a6f39992a0809071d88 (patch) | |
| tree | 95eee19b20c7eba74db2c52372da881049017145 /chrome/renderer/plugins | |
| parent | 89a6d31c96f2d54a6b985e9aa9913e20836d1e4d (diff) | |
| download | chromium_src-3ac5867cfe9d931a65d56a6f39992a0809071d88.zip chromium_src-3ac5867cfe9d931a65d56a6f39992a0809071d88.tar.gz chromium_src-3ac5867cfe9d931a65d56a6f39992a0809071d88.tar.bz2 | |
Revert r165444 "Add method to load resources without scale"
TBR=oshima@chromium.org
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/11360041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165445 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/plugins')
| -rw-r--r-- | chrome/renderer/plugins/plugin_placeholder.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc index 4590a92..bce80a8 100644 --- a/chrome/renderer/plugins/plugin_placeholder.cc +++ b/chrome/renderer/plugins/plugin_placeholder.cc @@ -39,6 +39,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_list.h" @@ -106,7 +107,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin( const WebPluginParams& params) { const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_BLOCKED_PLUGIN_HTML)); + IDR_BLOCKED_PLUGIN_HTML, ui::SCALE_FACTOR_NONE)); DictionaryValue values; values.SetString("message", l10n_util::GetStringUTF8(IDS_PLUGIN_SEARCHING)); @@ -137,7 +138,7 @@ PluginPlaceholder* PluginPlaceholder::CreateErrorPlugin( const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_BLOCKED_PLUGIN_HTML)); + IDR_BLOCKED_PLUGIN_HTML, ui::SCALE_FACTOR_NONE)); std::string html_data = jstemplate_builder::GetI18nTemplateHtml(template_html, &values); @@ -169,7 +170,7 @@ PluginPlaceholder* PluginPlaceholder::CreateBlockedPlugin( const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - template_id)); + template_id, ui::SCALE_FACTOR_NONE)); DCHECK(!template_html.empty()) << "unable to load template. ID: " << template_id; @@ -192,7 +193,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMobileYoutubePlugin( const WebPluginParams& params) { const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_MOBILE_YOUTUBE_PLUGIN_HTML)); + IDR_MOBILE_YOUTUBE_PLUGIN_HTML, ui::SCALE_FACTOR_NONE)); DictionaryValue values; values.SetString("video_id", GetYoutubeVideoId(params)); |