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

Unified Diff: content/child/ftp_directory_listing_response_delegate.cc

Issue 385163007: Fix the build when disable_ftp_support is set to 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: New version of fix of disable_ftp_support Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/ftp_directory_listing_response_delegate.cc
diff --git a/content/child/ftp_directory_listing_response_delegate.cc b/content/child/ftp_directory_listing_response_delegate.cc
index c3cc82705d9d281273eaa14b06a1183a20719884..09e6ca8a4e780ab9a4b258a605f618cebfabf944 100644
--- a/content/child/ftp_directory_listing_response_delegate.cc
+++ b/content/child/ftp_directory_listing_response_delegate.cc
@@ -82,7 +82,10 @@ void FtpDirectoryListingResponseDelegate::OnReceivedData(const char* data,
void FtpDirectoryListingResponseDelegate::OnCompletedRequest() {
std::vector<FtpDirectoryListingEntry> entries;
- int rv = net::ParseFtpDirectoryListing(buffer_, base::Time::Now(), &entries);
+ int rv = -1;
+#ifdef DISABLE_FTP_SUPPORT
+ rv = net::ParseFtpDirectoryListing(buffer_, base::Time::Now(), &entries);
+#endif
if (rv != net::OK) {
SendDataToClient("<script>onListingParsingError();</script>\n");
return;
@@ -103,7 +106,6 @@ void FtpDirectoryListingResponseDelegate::OnCompletedRequest() {
entry.name, entry.raw_name, is_directory, size, entry.last_modified));
}
}
-
lgombos 2014/07/14 15:00:57 You probably should not remove this line.
void FtpDirectoryListingResponseDelegate::Init(const GURL& response_url) {
net::UnescapeRule::Type unescape_rules = net::UnescapeRule::SPACES |
net::UnescapeRule::URL_SPECIAL_CHARS;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698