| 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 359c6e4fcee2f9bc05524df3fea2cb7cc4270c9b..68be7d1f54ea65c850802289e273e46f2f500885 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"
|
| @@ -136,10 +137,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<std::string, std::string> placeholders;
|
| + placeholders["textDirection"] = GetTextDirection();
|
| + placeholders["fontFamily"] = GetFontFamily();
|
| + placeholders["fontSize"] = GetFontSize();
|
|
|
| const ui::ResourceBundle& resource_bundle =
|
| ui::ResourceBundle::GetSharedInstance();
|
| @@ -147,7 +148,7 @@ std::string GetWebUiCssTextDefaults() {
|
| resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS)
|
| .as_string();
|
|
|
| - return ReplaceStringPlaceholders(css_template, placeholders, nullptr);
|
| + return ui::ReplaceTemplateExpressions(css_template, placeholders);
|
| }
|
|
|
| void AppendWebUiCssTextDefaults(std::string* html) {
|
|
|