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

Unified Diff: net/quic/reliable_quic_stream.h

Issue 763833003: Remove using namespace in net/quic/quic_stream_sequencer.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix missing part device_cloud_policy_manager_chromeos_unittest.cc Created 6 years 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 | « net/quic/quic_stream_sequencer_test.cc ('k') | net/quic/reliable_quic_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/reliable_quic_stream.h
diff --git a/net/quic/reliable_quic_stream.h b/net/quic/reliable_quic_stream.h
index 698fefb474922ed18c9eff7813b0f5f1c376ba36..1de600414eae997dc5fbd9aadcb97d07ce117c7f 100644
--- a/net/quic/reliable_quic_stream.h
+++ b/net/quic/reliable_quic_stream.h
@@ -10,6 +10,7 @@
#include <sys/types.h>
#include <list>
+#include <string>
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
@@ -67,7 +68,7 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
// Called to close the entire connection from this end.
virtual void CloseConnection(QuicErrorCode error);
virtual void CloseConnectionWithDetails(QuicErrorCode error,
- const string& details);
+ const std::string& details);
// Returns the effective priority for the stream. This value may change
// during the life of the stream.
@@ -181,11 +182,11 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
class ProxyAckNotifierDelegate;
struct PendingData {
- PendingData(string data_in,
+ PendingData(std::string data_in,
scoped_refptr<ProxyAckNotifierDelegate> delegate_in);
~PendingData();
- string data;
+ std::string data;
// Delegate that should be notified when the pending data is acked.
// Can be nullptr.
scoped_refptr<ProxyAckNotifierDelegate> delegate;
« no previous file with comments | « net/quic/quic_stream_sequencer_test.cc ('k') | net/quic/reliable_quic_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698