diff options
| author | avayvod@google.com <avayvod@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 20:09:19 +0000 |
|---|---|---|
| committer | avayvod@google.com <avayvod@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 20:09:19 +0000 |
| commit | 0d2e6a6da72279fe8f66eeb3b4442b6e5f4eb67c (patch) | |
| tree | ac8b45854d1aae7652b37c2561444327206c8067 /net/base/escape.h | |
| parent | 9101ef1e42dd9e3a101e22b4ad94c0b1f0dffbc9 (diff) | |
| download | chromium_src-0d2e6a6da72279fe8f66eeb3b4442b6e5f4eb67c.zip chromium_src-0d2e6a6da72279fe8f66eeb3b4442b6e5f4eb67c.tar.gz chromium_src-0d2e6a6da72279fe8f66eeb3b4442b6e5f4eb67c.tar.bz2 | |
The search terms are escaped using + or %20 for space depending on whether replacement is in query part of the URL or not.
Removed duplicate EscapeQueryParamValue functions without |use_plus| argument.
BUG=24571
TEST=Verify that space is escaped as stated in description; see bug description for example with search on Wikipedia.
Review URL: http://codereview.chromium.org/543077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/escape.h')
| -rw-r--r-- | net/base/escape.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/base/escape.h b/net/base/escape.h index 679e613..67ccc5f 100644 --- a/net/base/escape.h +++ b/net/base/escape.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_ESCAPE_H__ -#define NET_BASE_ESCAPE_H__ +#ifndef NET_BASE_ESCAPE_H_ +#define NET_BASE_ESCAPE_H_ #include <string> @@ -117,16 +117,15 @@ string16 UnescapeAndDecodeUTF8URLComponent(const std::string& text, // // TODO(brettw) bug 1201094: This function should be removed. See the bug for // why and what callers should do instead. -std::string EscapeQueryParamValue(const std::string& text); std::string EscapeQueryParamValue(const std::string& text, bool use_plus); bool EscapeQueryParamValue(const string16& text, const char* codepage, - string16* escaped); + bool use_plus, string16* escaped); // A specialized version of EscapeQueryParamValue for wide strings that // assumes the codepage is UTF8. This is provided as a convenience. // // TODO(brettw) bug 1201094: This function should be removed. See the bug for // why and what callers should do instead. -std::wstring EscapeQueryParamValueUTF8(const std::wstring& text); +std::wstring EscapeQueryParamValueUTF8(const std::wstring& text, bool use_plus); -#endif // #ifndef NET_BASE_ESCAPE_H__ +#endif // NET_BASE_ESCAPE_H_ |