diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:32:54 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:32:54 +0000 |
| commit | 89a6d31c96f2d54a6b985e9aa9913e20836d1e4d (patch) | |
| tree | 6fe013975a64dc1570d455e94d9ffc8153c9dda5 /chrome/renderer/plugins | |
| parent | c10baf7109f37d519f2500d4c4ba8206b7deee07 (diff) | |
| download | chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.zip chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.tar.gz chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.tar.bz2 | |
Add method to load resources without scale
This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h
I'll cleanup ContentClient in separate CL.
BUG=156569
TEST=none. no functional change.
Review URL: https://chromiumcodereview.appspot.com/11341003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/plugins')
| -rw-r--r-- | chrome/renderer/plugins/plugin_placeholder.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc index bce80a8..4590a92 100644 --- a/chrome/renderer/plugins/plugin_placeholder.cc +++ b/chrome/renderer/plugins/plugin_placeholder.cc @@ -39,7 +39,6 @@ #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" @@ -107,7 +106,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin( const WebPluginParams& params) { const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_BLOCKED_PLUGIN_HTML, ui::SCALE_FACTOR_NONE)); + IDR_BLOCKED_PLUGIN_HTML)); DictionaryValue values; values.SetString("message", l10n_util::GetStringUTF8(IDS_PLUGIN_SEARCHING)); @@ -138,7 +137,7 @@ PluginPlaceholder* PluginPlaceholder::CreateErrorPlugin( const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_BLOCKED_PLUGIN_HTML, ui::SCALE_FACTOR_NONE)); + IDR_BLOCKED_PLUGIN_HTML)); std::string html_data = jstemplate_builder::GetI18nTemplateHtml(template_html, &values); @@ -170,7 +169,7 @@ PluginPlaceholder* PluginPlaceholder::CreateBlockedPlugin( const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - template_id, ui::SCALE_FACTOR_NONE)); + template_id)); DCHECK(!template_html.empty()) << "unable to load template. ID: " << template_id; @@ -193,7 +192,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMobileYoutubePlugin( const WebPluginParams& params) { const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_MOBILE_YOUTUBE_PLUGIN_HTML, ui::SCALE_FACTOR_NONE)); + IDR_MOBILE_YOUTUBE_PLUGIN_HTML)); DictionaryValue values; values.SetString("video_id", GetYoutubeVideoId(params)); |