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

Unified Diff: chrome/common/jstemplate_builder.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. 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/common/jstemplate_builder.cc
diff --git a/chrome/common/jstemplate_builder.cc b/chrome/common/jstemplate_builder.cc
index 9d0d46b5db0a5299113dfd9e68963dc5d909e39e..31c0c4d27af04cf2309ef362d04f1d254b668bcc 100644
--- a/chrome/common/jstemplate_builder.cc
+++ b/chrome/common/jstemplate_builder.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "grit/common_resources.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
@@ -91,7 +92,7 @@ void AppendJsTemplateSourceHtml(std::string* output) {
// fetch and cache the pointer of the jstemplate resource source text.
static const base::StringPiece jstemplate_src(
ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_JSTEMPLATE_JS));
+ IDR_JSTEMPLATE_JS, ui::SCALE_FACTOR_NONE));
if (jstemplate_src.empty()) {
NOTREACHED() << "Unable to get jstemplate src";
@@ -117,10 +118,10 @@ void AppendI18nTemplateSourceHtml(std::string* output) {
// fetch and cache the pointer of the jstemplate resource source text.
static const base::StringPiece i18n_template_src(
ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_I18N_TEMPLATE_JS));
+ IDR_I18N_TEMPLATE_JS, ui::SCALE_FACTOR_NONE));
static const base::StringPiece i18n_template2_src(
ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_I18N_TEMPLATE2_JS));
+ IDR_I18N_TEMPLATE2_JS, ui::SCALE_FACTOR_NONE));
const base::StringPiece* template_src = g_version2 ?
&i18n_template2_src : &i18n_template_src;
@@ -140,7 +141,7 @@ void AppendI18nTemplateProcessHtml(std::string* output) {
static const base::StringPiece i18n_process_src(
ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_I18N_PROCESS_JS));
+ IDR_I18N_PROCESS_JS, ui::SCALE_FACTOR_NONE));
if (i18n_process_src.empty()) {
NOTREACHED() << "Unable to get i18n process src";

Powered by Google App Engine
This is Rietveld 408576698