From 0daa2d36e70f005e199c63a1985c961fad05f28c Mon Sep 17 00:00:00 2001 From: brettw Date: Tue, 14 Jul 2015 23:43:31 -0700 Subject: Move ReplaceStringPlaceholders to base namespace. Removes most unnecessary base:: qualifications from string_util. Updates ReplaceStringPlaceholders implementation to use C++11 features for the loop iterators. TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1227413007 Cr-Commit-Position: refs/heads/master@{#338826} --- ui/base/l10n/l10n_util.cc | 2 +- ui/base/webui/web_ui_util.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index 0ef20ba..de0e620 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -707,7 +707,7 @@ base::string16 GetStringFUTF16(int message_id, } #endif - base::string16 formatted = ReplaceStringPlaceholders( + base::string16 formatted = base::ReplaceStringPlaceholders( format_string, replacements, offsets); AdjustParagraphDirectionality(&formatted); diff --git a/ui/base/webui/web_ui_util.cc b/ui/base/webui/web_ui_util.cc index 160f4da..c0f5a9d 100644 --- a/ui/base/webui/web_ui_util.cc +++ b/ui/base/webui/web_ui_util.cc @@ -130,7 +130,7 @@ std::string GetWebUiCssTextDefaults() { resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS) .as_string(); - return ReplaceStringPlaceholders(css_template, placeholders, nullptr); + return base::ReplaceStringPlaceholders(css_template, placeholders, nullptr); } void AppendWebUiCssTextDefaults(std::string* html) { -- cgit v1.1