diff options
| author | paulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 21:42:17 +0000 |
|---|---|---|
| committer | paulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 21:42:17 +0000 |
| commit | e537c3515e270527ba2fa54fcfc4a1ed49cc975e (patch) | |
| tree | 73212c8ae2fa174d15a72bbd9a86af7e7bfade93 /net/base/net_util.h | |
| parent | 5aa442010bcc65c5d30dda379b39cc2f8182ec60 (diff) | |
| download | chromium_src-e537c3515e270527ba2fa54fcfc4a1ed49cc975e.zip chromium_src-e537c3515e270527ba2fa54fcfc4a1ed49cc975e.tar.gz chromium_src-e537c3515e270527ba2fa54fcfc4a1ed49cc975e.tar.bz2 | |
Fix some character conversions and Mac compile errors for net_util.cc.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.h')
| -rw-r--r-- | net/base/net_util.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/base/net_util.h b/net/base/net_util.h index ab89182..148ab5d 100644 --- a/net/base/net_util.h +++ b/net/base/net_util.h @@ -30,8 +30,13 @@ #ifndef NET_BASE_NET_UTIL_H__ #define NET_BASE_NET_UTIL_H__ +#include "build/build_config.h" + #include <string> + +#ifdef OS_WIN #include <windows.h> +#endif #include "base/basictypes.h" #include "googleurl/src/url_canon.h" @@ -112,15 +117,17 @@ void IDNToUnicode(const char* host, // Canonicalizes |host| and returns it. If |is_ip_address| is non-NULL, sets it // to true if |host| is an IP address. -template <typename str> -std::string CanonicalizeHost(const str& host, bool* is_ip_address); +std::string CanonicalizeHost(const std::string& host, bool* is_ip_address); +std::string CanonicalizeHost(const std::wstring& host, bool* is_ip_address); // Call these functions to get the html for a directory listing. // They will pass non-7bit-ascii characters unescaped, allowing // the browser to interpret the encoding (utf8, etc). std::string GetDirectoryListingHeader(const std::string& title); +#ifdef OS_WIN std::string GetDirectoryListingEntry(const std::string& name, DWORD attrib, int64 size, const FILETIME* modified); +#endif // If text starts with "www." it is removed, otherwise text is returned // unmodified. |