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

Unified Diff: ui/base/webui/web_ui_util.cc

Issue 1220793010: [ui/base;css] adding string template expression replacement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review changes Created 5 years, 5 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: ui/base/webui/web_ui_util.cc
diff --git a/ui/base/webui/web_ui_util.cc b/ui/base/webui/web_ui_util.cc
index c0f5a9dc32ee4783fc2f5a52f0f42f215d9547fb..6483f077b72ad40ec717bb25caa5017be9bc3401 100644
--- a/ui/base/webui/web_ui_util.cc
+++ b/ui/base/webui/web_ui_util.cc
@@ -16,6 +16,7 @@
#include "net/base/escape.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/template_expressions.h"
#include "ui/base/window_open_disposition.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/font.h"
@@ -119,10 +120,10 @@ void SetLoadTimeDataDefaults(const std::string& app_locale,
}
std::string GetWebUiCssTextDefaults() {
- std::vector<std::string> placeholders;
- placeholders.push_back(GetTextDirection()); // $1
- placeholders.push_back(GetFontFamily()); // $2
- placeholders.push_back(GetFontSize()); // $3
+ std::map<base::StringPiece, std::string> placeholders;
+ placeholders["textDirection"] = GetTextDirection();
+ placeholders["fontFamily"] = GetFontFamily();
+ placeholders["fontSize"] = GetFontSize();
const ui::ResourceBundle& resource_bundle =
ui::ResourceBundle::GetSharedInstance();
@@ -130,7 +131,7 @@ std::string GetWebUiCssTextDefaults() {
resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS)
.as_string();
- return base::ReplaceStringPlaceholders(css_template, placeholders, nullptr);
+ return ui::ReplaceTemplateExpressions(css_template, placeholders);
}
void AppendWebUiCssTextDefaults(std::string* html) {

Powered by Google App Engine
This is Rietveld 408576698