From dff6d13ca6ddb778867ce2d731d5f8093aef28ea Mon Sep 17 00:00:00 2001 From: "glen@chromium.org" Date: Fri, 15 May 2009 22:40:57 +0000 Subject: Re-land of earlier NTP theme patch; now with mac and linux compatibility. Review URL: http://codereview.chromium.org/115413 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16205 0039d316-1c4b-4281-b951-d872f2087c98 --- base/string_util.h | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'base/string_util.h') diff --git a/base/string_util.h b/base/string_util.h index 7df1d92..cb71553 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -558,30 +558,17 @@ std::string JoinString(const std::vector& parts, char s); void SplitStringAlongWhitespace(const std::wstring& str, std::vector* result); -// Replace $1-$2-$3 in the format string with |a| and |b| respectively. -// Additionally, $$ is replaced by $. The offset/offsets parameter here can be -// NULL. +// Replace $1-$2-$3..$9 in the format string with |a|-|b|-|c|..|i| respectively. +// Additionally, $$ is replaced by $. The offsets parameter here can +// be NULL. This only allows you to use up to nine replacements. string16 ReplaceStringPlaceholders(const string16& format_string, - const string16& a, - size_t* offset); - -string16 ReplaceStringPlaceholders(const string16& format_string, - const string16& a, - const string16& b, + const std::vector& subst, std::vector* offsets); +// Single-string shortcut for ReplaceStringHolders. string16 ReplaceStringPlaceholders(const string16& format_string, const string16& a, - const string16& b, - const string16& c, - std::vector* offsets); - -string16 ReplaceStringPlaceholders(const string16& format_string, - const string16& a, - const string16& b, - const string16& c, - const string16& d, - std::vector* offsets); + size_t* offset); // If the size of |input| is more than |max_len|, this function returns true and // |input| is shortened into |output| by removing chars in the middle (they are -- cgit v1.1