diff options
| author | brettw <brettw@chromium.org> | 2015-07-14 23:43:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 06:44:05 +0000 |
| commit | 0daa2d36e70f005e199c63a1985c961fad05f28c (patch) | |
| tree | 4899d0799c7a8c4845b6db931e7bf178d14c9753 /ui | |
| parent | 9d1423af551de300783135062156069539dc57e0 (diff) | |
| download | chromium_src-0daa2d36e70f005e199c63a1985c961fad05f28c.zip chromium_src-0daa2d36e70f005e199c63a1985c961fad05f28c.tar.gz chromium_src-0daa2d36e70f005e199c63a1985c961fad05f28c.tar.bz2 | |
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}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/l10n/l10n_util.cc | 2 | ||||
| -rw-r--r-- | ui/base/webui/web_ui_util.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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) { |