diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 20:59:09 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 20:59:09 +0000 |
commit | 70c209d8418a49a809eddab94b8816d47a93bfd8 (patch) | |
tree | 44eaa7de2227c288ec3098cb11a87d632505cdea /chrome/browser/net/url_fixer_upper.cc | |
parent | d8dca13dc0b5218a0f4387b76cd8d4952e9b66f5 (diff) | |
download | chromium_src-70c209d8418a49a809eddab94b8816d47a93bfd8.zip chromium_src-70c209d8418a49a809eddab94b8816d47a93bfd8.tar.gz chromium_src-70c209d8418a49a809eddab94b8816d47a93bfd8.tar.bz2 |
Revert 72380 - Remove wstring from autocomplete.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6258015
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6256010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/url_fixer_upper.cc')
-rw-r--r-- | chrome/browser/net/url_fixer_upper.cc | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index 07881a4..4c36368 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -72,50 +72,6 @@ void UTF8PartsToWideParts(const std::string& text_utf8, parts->ref = UTF8ComponentToWideComponent(text_utf8, parts_utf8.ref); } -#if defined(WCHAR_T_IS_UTF32) -url_parse::Component UTF8ComponentToUTF16Component( - const std::string& text_utf8, - const url_parse::Component& component_utf8) { - if (component_utf8.len == -1) - return url_parse::Component(); - - std::string before_component_string = - text_utf8.substr(0, component_utf8.begin); - std::string component_string = text_utf8.substr(component_utf8.begin, - component_utf8.len); - string16 before_component_string_16 = UTF8ToUTF16(before_component_string); - string16 component_string_16 = UTF8ToUTF16(component_string); - url_parse::Component component_16(before_component_string_16.length(), - component_string_16.length()); - return component_16; -} - -void UTF8PartsToUTF16Parts(const std::string& text_utf8, - const url_parse::Parsed& parts_utf8, - url_parse::Parsed* parts) { - if (IsStringASCII(text_utf8)) { - *parts = parts_utf8; - return; - } - - parts->scheme = - UTF8ComponentToUTF16Component(text_utf8, parts_utf8.scheme); - parts ->username = - UTF8ComponentToUTF16Component(text_utf8, parts_utf8.username); - parts->password = - UTF8ComponentToUTF16Component(text_utf8, parts_utf8.password); - parts->host = - UTF8ComponentToUTF16Component(text_utf8, parts_utf8.host); - parts->port = - UTF8ComponentToUTF16Component(text_utf8, parts_utf8.port); - parts->path = - UTF8ComponentToUTF16Component(text_utf8, parts_utf8.path); - parts->query = - UTF8ComponentToUTF16Component(text_utf8, parts_utf8.query); - parts->ref = - UTF8ComponentToUTF16Component(text_utf8, parts_utf8.ref); -} -#endif TrimPositions TrimWhitespaceUTF8(const std::string& input, TrimPositions positions, @@ -625,16 +581,6 @@ std::wstring URLFixerUpper::SegmentURL(const std::wstring& text, UTF8PartsToWideParts(text_utf8, parts_utf8, parts); return UTF8ToWide(scheme_utf8); } -#if defined(WCHAR_T_IS_UTF32) -string16 URLFixerUpper::SegmentURL(const string16& text, - url_parse::Parsed* parts) { - std::string text_utf8 = UTF16ToUTF8(text); - url_parse::Parsed parts_utf8; - std::string scheme_utf8 = SegmentURL(text_utf8, &parts_utf8); - UTF8PartsToUTF16Parts(text_utf8, parts_utf8, parts); - return UTF8ToUTF16(scheme_utf8); -} -#endif GURL URLFixerUpper::FixupRelativeFile(const std::wstring& base_dir, const std::wstring& text) { return FixupRelativeFile(FilePath::FromWStringHack(base_dir), |