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.cc | |
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.cc')
-rw-r--r-- | url/gurl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/url/gurl.cc b/url/gurl.cc index 9753152..3dd8463 100644 --- a/url/gurl.cc +++ b/url/gurl.cc @@ -102,7 +102,7 @@ GURL::GURL(const std::string& url_string) : inner_url_(NULL) { } } -GURL::GURL(const string16& url_string) : inner_url_(NULL) { +GURL::GURL(const base::string16& url_string) : inner_url_(NULL) { is_valid_ = InitCanonical(url_string, &spec_, &parsed_); if (is_valid_ && SchemeIsFileSystem()) { inner_url_ = @@ -179,7 +179,7 @@ const std::string& GURL::spec() const { GURL GURL::Resolve(const std::string& relative) const { return ResolveWithCharsetConverter(relative, NULL); } -GURL GURL::Resolve(const string16& relative) const { +GURL GURL::Resolve(const base::string16& relative) const { return ResolveWithCharsetConverter(relative, NULL); } @@ -217,7 +217,7 @@ GURL GURL::ResolveWithCharsetConverter( // Note: code duplicated above (it's inconvenient to use a template here). GURL GURL::ResolveWithCharsetConverter( - const string16& relative, + const base::string16& relative, url_canon::CharsetConverter* charset_converter) const { // Not allowed for invalid URLs. if (!is_valid_) @@ -275,7 +275,7 @@ GURL GURL::ReplaceComponents( // Note: code duplicated above (it's inconvenient to use a template here). GURL GURL::ReplaceComponents( - const url_canon::Replacements<char16>& replacements) const { + const url_canon::Replacements<base::char16>& replacements) const { GURL result; // Not allowed for invalid URLs. |