diff options
author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 19:40:37 +0000 |
---|---|---|
committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 19:40:37 +0000 |
commit | 8ac1a75acadaa2aae065212cb6255d00c789a184 (patch) | |
tree | 854eaf66ba8ce7e581bd8e6f1fa75f46d22f4bb7 /net/url_request/url_request_ftp_job.cc | |
parent | 287a019ed5d015185cab41f6c7156dc6c4cbcee7 (diff) | |
download | chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.zip chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.tar.gz chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.tar.bz2 |
Move more net classes into the net namespace. Also remove the net_util namespace in favor of the net namespace.
This is a purely mechanical change. There should be no logic changes.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_ftp_job.cc')
-rw-r--r-- | net/url_request/url_request_ftp_job.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index 7c9b5e8..23a726d 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -79,7 +79,7 @@ URLRequestJob* URLRequestFtpJob::Factory(URLRequest* request, DCHECK(scheme == "ftp"); if (request->url().has_port() && - !net_util::IsPortAllowedByFtp(request->url().IntPort())) + !net::IsPortAllowedByFtp(request->url().IntPort())) return new URLRequestErrorJob(request, net::ERR_UNSAFE_PORT); return new URLRequestFtpJob(request); @@ -396,7 +396,7 @@ void URLRequestFtpJob::OnFindFile(DWORD last_error) { // We don't know the encoding, and can't assume utf8, so pass the 8bit // directly to the browser for it to decide. - string file_entry = net_util::GetDirectoryListingEntry( + string file_entry = net::GetDirectoryListingEntry( find_data_.cFileName, find_data_.dwFileAttributes, size, &find_data_.ftLastWriteTime); WriteData(&file_entry, true); @@ -413,14 +413,14 @@ void URLRequestFtpJob::OnStartDirectoryTraversal() { state_ = GETTING_DIRECTORY; // Unescape the URL path and pass the raw 8bit directly to the browser. - string html = net_util::GetDirectoryListingHeader( + string html = net::GetDirectoryListingHeader( UnescapeURLComponent(request_->url().path(), UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS)); // If this isn't top level directory (i.e. the path isn't "/",) add a link to // the parent directory. if (request_->url().path().length() > 1) - html.append(net_util::GetDirectoryListingEntry("..", 0, 0, NULL)); + html.append(net::GetDirectoryListingEntry("..", 0, 0, NULL)); WriteData(&html, true); |