Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6915)

Unified Diff: chrome/renderer/plugins/plugin_placeholder.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Convert ptr to bool for win compile. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));

Powered by Google App Engine
This is Rietveld 408576698