diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
| commit | c49201a506dba0e3a04aad623e4b259f948f3159 (patch) | |
| tree | 2a93fff52861f5c8dd87e23bc23d170b7cb1309e /chrome/renderer/plugins/plugin_placeholder.cc | |
| parent | 16bb3c2f909662329b117e063280f6cfc2cca3f9 (diff) | |
| download | chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.zip chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.gz chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.bz2 | |
Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."
Relanding original CL 137734, http://codereview.chromium.org/10387010/.
TBR=aa,abodenha,ben,sail,tony
BUG=123611
TEST=All try bots pass and aura runs without errors.
Review URL: https://chromiumcodereview.appspot.com/10412004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/plugins/plugin_placeholder.cc')
| -rw-r--r-- | chrome/renderer/plugins/plugin_placeholder.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc index e87bbea..cf85d24 100644 --- a/chrome/renderer/plugins/plugin_placeholder.cc +++ b/chrome/renderer/plugins/plugin_placeholder.cc @@ -12,8 +12,8 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/render_messages.h" #include "chrome/common/prerender_messages.h" +#include "chrome/common/render_messages.h" #include "chrome/renderer/chrome_content_renderer_client.h" #include "chrome/renderer/custom_menu_commands.h" #include "chrome/renderer/plugins/plugin_uma.h" @@ -22,9 +22,6 @@ #include "grit/generated_resources.h" #include "grit/renderer_resources.h" #include "grit/webkit_strings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" @@ -36,7 +33,11 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCaseSensitivity.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" +#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_group.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::SCALE_FACTOR_NONE)); 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::SCALE_FACTOR_NONE)); 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::SCALE_FACTOR_NONE)); 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::SCALE_FACTOR_NONE)); DictionaryValue values; values.SetString("video_id", GetYoutubeVideoId(params)); |