diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 21:21:57 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 21:21:57 +0000 |
| commit | 3774f835ddbe5005ad49c5a1818b3fcbfff4f703 (patch) | |
| tree | 57fc897925de5dffb8e66cc2f4cdf23a8f3762f0 /url/gurl.h | |
| parent | e8eecbf087af308f5dd0440923ea85f877041e2b (diff) | |
| download | chromium_src-3774f835ddbe5005ad49c5a1818b3fcbfff4f703.zip chromium_src-3774f835ddbe5005ad49c5a1818b3fcbfff4f703.tar.gz chromium_src-3774f835ddbe5005ad49c5a1818b3fcbfff4f703.tar.bz2 | |
Use base:: on string16 and char16 in net/ and url/
BUG=none
TEST=no change
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/16413006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/gurl.h')
| -rw-r--r-- | url/gurl.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -17,7 +17,7 @@ class URL_EXPORT GURL { public: typedef url_canon::StdStringReplacements<std::string> Replacements; - typedef url_canon::StdStringReplacements<string16> ReplacementsW; + typedef url_canon::StdStringReplacements<base::string16> ReplacementsW; // Creates an empty, invalid URL. GURL(); @@ -34,7 +34,7 @@ class URL_EXPORT GURL { // version to assume the query parameter encoding should be the same as the // input encoding. explicit GURL(const std::string& url_string /*, output_param_encoding*/); - explicit GURL(const string16& url_string /*, output_param_encoding*/); + explicit GURL(const base::string16& url_string /*, output_param_encoding*/); // Constructor for URLs that have already been parsed and canonicalized. This // is used for conversions from KURL, for example. The caller must supply all @@ -129,7 +129,7 @@ class URL_EXPORT GURL { // It is an error to resolve a URL relative to an invalid URL. The result // will be the empty URL. GURL Resolve(const std::string& relative) const; - GURL Resolve(const string16& relative) const; + GURL Resolve(const base::string16& relative) const; // Like Resolve() above but takes a character set encoder which will be used // for any query text specified in the input. The charset converter parameter @@ -142,7 +142,7 @@ class URL_EXPORT GURL { const std::string& relative, url_canon::CharsetConverter* charset_converter) const; GURL ResolveWithCharsetConverter( - const string16& relative, + const base::string16& relative, url_canon::CharsetConverter* charset_converter) const; // Creates a new GURL by replacing the current URL's components with the @@ -159,7 +159,7 @@ class URL_EXPORT GURL { GURL ReplaceComponents( const url_canon::Replacements<char>& replacements) const; GURL ReplaceComponents( - const url_canon::Replacements<char16>& replacements) const; + const url_canon::Replacements<base::char16>& replacements) const; // A helper function that is equivalent to replacing the path with a slash // and clearing out everything after that. We sometimes need to know just the |