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

Unified Diff: remoting/protocol/channel_multiplexer.h

Issue 2386733002: Remove stl_util's deletion functions from remoting/. (Closed)
Patch Set: fix Created 4 years, 3 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 | « remoting/base/buffered_socket_writer.cc ('k') | remoting/protocol/channel_multiplexer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_multiplexer.h
diff --git a/remoting/protocol/channel_multiplexer.h b/remoting/protocol/channel_multiplexer.h
index b14767b683427bfe8862882bf1029ec806646bce..16af179105db08a0e71d6cee68cd2108f3298c8e 100644
--- a/remoting/protocol/channel_multiplexer.h
+++ b/remoting/protocol/channel_multiplexer.h
@@ -5,6 +5,8 @@
#ifndef REMOTING_PROTOCOL_CHANNEL_MULTIPLEXER_H_
#define REMOTING_PROTOCOL_CHANNEL_MULTIPLEXER_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "remoting/base/buffered_socket_writer.h"
@@ -72,7 +74,7 @@ class ChannelMultiplexer : public StreamChannelFactory {
std::list<PendingChannel> pending_channels_;
int next_channel_id_;
- std::map<std::string, MuxChannel*> channels_;
+ std::map<std::string, std::unique_ptr<MuxChannel>> channels_;
// Channels are added to |channels_by_receive_id_| only after we receive
// receive_id from the remote peer.
« no previous file with comments | « remoting/base/buffered_socket_writer.cc ('k') | remoting/protocol/channel_multiplexer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698