net/ftp/ftp_network_transaction.h - Issue 754433003: Update from https://crrev.com/305340

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/ftp/ftp_network_transaction.h

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/ftp/ftp_network_transaction.h

diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h

index c8ed550968c1a238db34e25037c248e91bab9669..e350e16ffb3755b1a5381902cb3df5945d89c947 100644

--- a/net/ftp/ftp_network_transaction.h

+++ b/net/ftp/ftp_network_transaction.h

@@ -8,6 +8,7 @@

#include <string>

#include <utility>

+#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

@@ -245,7 +246,7 @@ class NET_EXPORT_PRIVATE FtpNetworkTransaction : public FtpTransaction {

// with any trailing slash removed.

std::string current_remote_directory_;

- int data_connection_port_;

+ uint16 data_connection_port_;

ClientSocketFactory* socket_factory_;

« no previous file with comments | « net/filter/sdch_filter_unittest.cc ('k') | net/ftp/ftp_network_transaction.cc » ('j') | no next file with comments »