Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Side by Side Diff: net/url_request/url_request_ftp_job.cc

Issue 6488010: Propagate the remote socket address to URLRequest and to ViewHostMsg_FrameNavigate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address eroman's comments Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/url_request/url_request_ftp_job.h" 5 #include "net/url_request/url_request_ftp_job.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "net/base/auth.h" 10 #include "net/base/auth.h"
11 #include "net/base/host_port_pair.h"
11 #include "net/base/net_errors.h" 12 #include "net/base/net_errors.h"
12 #include "net/base/net_util.h" 13 #include "net/base/net_util.h"
13 #include "net/ftp/ftp_response_info.h" 14 #include "net/ftp/ftp_response_info.h"
14 #include "net/ftp/ftp_transaction_factory.h" 15 #include "net/ftp/ftp_transaction_factory.h"
15 #include "net/url_request/url_request.h" 16 #include "net/url_request/url_request.h"
16 #include "net/url_request/url_request_context.h" 17 #include "net/url_request/url_request_context.h"
17 #include "net/url_request/url_request_error_job.h" 18 #include "net/url_request/url_request_error_job.h"
18 19
19 namespace net { 20 namespace net {
20 21
(...skipping 24 matching lines...) Expand all
45 } 46 }
46 47
47 bool URLRequestFtpJob::GetMimeType(std::string* mime_type) const { 48 bool URLRequestFtpJob::GetMimeType(std::string* mime_type) const {
48 if (transaction_->GetResponseInfo()->is_directory_listing) { 49 if (transaction_->GetResponseInfo()->is_directory_listing) {
49 *mime_type = "text/vnd.chromium.ftp-dir"; 50 *mime_type = "text/vnd.chromium.ftp-dir";
50 return true; 51 return true;
51 } 52 }
52 return false; 53 return false;
53 } 54 }
54 55
56 HostPortPair URLRequestFtpJob::GetSocketAddress() const {
57 if (!transaction_.get()) {
58 return HostPortPair();
59 }
60 return transaction_->GetResponseInfo()->socket_address;
61 }
62
55 URLRequestFtpJob::~URLRequestFtpJob() { 63 URLRequestFtpJob::~URLRequestFtpJob() {
56 } 64 }
57 65
58 void URLRequestFtpJob::StartTransaction() { 66 void URLRequestFtpJob::StartTransaction() {
59 // Create a transaction. 67 // Create a transaction.
60 DCHECK(!transaction_.get()); 68 DCHECK(!transaction_.get());
61 DCHECK(request_->context()); 69 DCHECK(request_->context());
62 DCHECK(request_->context()->ftp_transaction_factory()); 70 DCHECK(request_->context()->ftp_transaction_factory());
63 71
64 transaction_.reset( 72 transaction_.reset(
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 if (rv == ERR_IO_PENDING) { 245 if (rv == ERR_IO_PENDING) {
238 read_in_progress_ = true; 246 read_in_progress_ = true;
239 SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0)); 247 SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
240 } else { 248 } else {
241 NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv)); 249 NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv));
242 } 250 }
243 return false; 251 return false;
244 } 252 }
245 253
246 } // namespace net 254 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698