diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/ui/base/webui/web_ui_util.cc | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
| download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ui/base/webui/web_ui_util.cc')
| -rw-r--r-- | chromium/ui/base/webui/web_ui_util.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/chromium/ui/base/webui/web_ui_util.cc b/chromium/ui/base/webui/web_ui_util.cc index 0f91f3f7045..85670e715e3 100644 --- a/chromium/ui/base/webui/web_ui_util.cc +++ b/chromium/ui/base/webui/web_ui_util.cc @@ -123,7 +123,7 @@ void SetLoadTimeDataDefaults(const std::string& app_locale, localized_strings->SetString("textdirection", GetTextDirection()); } -std::string GetWebUiCssTextDefaults(const std::string& css_template) { +std::string GetWebUiCssTextDefaults(base::StringPiece css_template) { ui::TemplateReplacements placeholders; placeholders["textDirection"] = GetTextDirection(); placeholders["fontFamily"] = GetFontFamily(); @@ -134,19 +134,15 @@ std::string GetWebUiCssTextDefaults(const std::string& css_template) { 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 GetWebUiCssTextDefaults( + resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS)); } 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); + return GetWebUiCssTextDefaults( + resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS_MD)); } void AppendWebUiCssTextDefaults(std::string* html) { |