Chromium Code Reviews| 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 7c894f698051c7431585b9be50a9363884d1ca65..928cadfbb2698b6db3b60a470103d1bef58e490c 100644 |
| --- a/ui/base/webui/web_ui_util.cc |
| +++ b/ui/base/webui/web_ui_util.cc |
| @@ -122,19 +122,30 @@ void SetLoadTimeDataDefaults(const std::string& app_locale, |
| localized_strings->SetString("textdirection", GetTextDirection()); |
| } |
| -std::string GetWebUiCssTextDefaults() { |
| +std::string GetWebUiCssTextDefaults(std::string css_template) { |
|
Dan Beam
2016/01/12 23:05:52
const-ref
edwardjung
2016/01/13 21:24:07
Done.
|
| std::map<base::StringPiece, std::string> placeholders; |
| placeholders["textDirection"] = GetTextDirection(); |
| placeholders["fontFamily"] = GetFontFamily(); |
| placeholders["fontSize"] = GetFontSize(); |
| + return ui::ReplaceTemplateExpressions(css_template, placeholders); |
| +} |
| +std::string GetWebUiCssTextDefaults() { |
| const ui::ResourceBundle& resource_bundle = |
| ui::ResourceBundle::GetSharedInstance(); |
| const std::string& css_template = |
| resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS) |
| .as_string(); |
| + return GetWebUiCssTextDefaults(css_template); |
| +} |
| - return ui::ReplaceTemplateExpressions(css_template, placeholders); |
| +std::string GetWebUiCssTextDefaultsMD() { |
| + const ui::ResourceBundle& resource_bundle = |
| + ui::ResourceBundle::GetSharedInstance(); |
| + const std::string& css_template = |
| + resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS_MD) |
| + .as_string(); |
| + return GetWebUiCssTextDefaults(css_template); |
| } |
| void AppendWebUiCssTextDefaults(std::string* html) { |