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

Unified Diff: remoting/protocol/channel_dispatcher_base.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 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/protocol/channel_authenticator.h ('k') | remoting/protocol/channel_dispatcher_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_dispatcher_base.h
diff --git a/remoting/protocol/channel_dispatcher_base.h b/remoting/protocol/channel_dispatcher_base.h
index 0a1e29cfbc2833bda73196b33dc63478c3771a94..1d97a61d9629f7a9ab5d837a0cb0b8512e883d11 100644
--- a/remoting/protocol/channel_dispatcher_base.h
+++ b/remoting/protocol/channel_dispatcher_base.h
@@ -5,11 +5,11 @@
#ifndef REMOTING_PROTOCOL_CHANNEL_DISPATCHER_BASE_H_
#define REMOTING_PROTOCOL_CHANNEL_DISPATCHER_BASE_H_
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "remoting/protocol/errors.h"
namespace remoting {
@@ -58,17 +58,17 @@ class ChannelDispatcherBase {
MessagePipe* message_pipe() { return message_pipe_.get(); }
// Child classes must override this method to handle incoming messages.
- virtual void OnIncomingMessage(scoped_ptr<CompoundBuffer> message) = 0;
+ virtual void OnIncomingMessage(std::unique_ptr<CompoundBuffer> message) = 0;
private:
- void OnChannelReady(scoped_ptr<MessagePipe> message_pipe);
+ void OnChannelReady(std::unique_ptr<MessagePipe> message_pipe);
void OnPipeError(int error);
std::string channel_name_;
MessageChannelFactory* channel_factory_ = nullptr;
EventHandler* event_handler_ = nullptr;
- scoped_ptr<MessagePipe> message_pipe_;
+ std::unique_ptr<MessagePipe> message_pipe_;
DISALLOW_COPY_AND_ASSIGN(ChannelDispatcherBase);
};
« no previous file with comments | « remoting/protocol/channel_authenticator.h ('k') | remoting/protocol/channel_dispatcher_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698