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

Unified Diff: remoting/protocol/webrtc_connection_to_client.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/video_stub.h ('k') | remoting/protocol/webrtc_connection_to_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/webrtc_connection_to_client.h
diff --git a/remoting/protocol/webrtc_connection_to_client.h b/remoting/protocol/webrtc_connection_to_client.h
index 13d0ee36c2d988c80e9d60149617e088b5a2c17e..34f51ba9fcf4a0421016d0e04f3106a4b9d7b494 100644
--- a/remoting/protocol/webrtc_connection_to_client.h
+++ b/remoting/protocol/webrtc_connection_to_client.h
@@ -7,10 +7,10 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "remoting/protocol/channel_dispatcher_base.h"
#include "remoting/protocol/connection_to_client.h"
@@ -29,7 +29,7 @@ class WebrtcConnectionToClient : public ConnectionToClient,
public ChannelDispatcherBase::EventHandler {
public:
WebrtcConnectionToClient(
- scoped_ptr<Session> session,
+ std::unique_ptr<Session> session,
scoped_refptr<protocol::TransportContext> transport_context);
~WebrtcConnectionToClient() override;
@@ -39,8 +39,8 @@ class WebrtcConnectionToClient : public ConnectionToClient,
Session* session() override;
void Disconnect(ErrorCode error) override;
void OnInputEventReceived(int64_t timestamp) override;
- scoped_ptr<VideoStream> StartVideoStream(
- scoped_ptr<webrtc::DesktopCapturer> desktop_capturer) override;
+ std::unique_ptr<VideoStream> StartVideoStream(
+ std::unique_ptr<webrtc::DesktopCapturer> desktop_capturer) override;
AudioStub* audio_stub() override;
ClientStub* client_stub() override;
void set_clipboard_stub(ClipboardStub* clipboard_stub) override;
@@ -70,10 +70,10 @@ class WebrtcConnectionToClient : public ConnectionToClient,
WebrtcTransport transport_;
- scoped_ptr<Session> session_;
+ std::unique_ptr<Session> session_;
- scoped_ptr<HostControlDispatcher> control_dispatcher_;
- scoped_ptr<HostEventDispatcher> event_dispatcher_;
+ std::unique_ptr<HostControlDispatcher> control_dispatcher_;
+ std::unique_ptr<HostEventDispatcher> event_dispatcher_;
DISALLOW_COPY_AND_ASSIGN(WebrtcConnectionToClient);
};
« no previous file with comments | « remoting/protocol/video_stub.h ('k') | remoting/protocol/webrtc_connection_to_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698