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

Unified Diff: remoting/protocol/webrtc_connection_to_host.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/webrtc_connection_to_client.cc ('k') | remoting/protocol/webrtc_connection_to_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/webrtc_connection_to_host.h
diff --git a/remoting/protocol/webrtc_connection_to_host.h b/remoting/protocol/webrtc_connection_to_host.h
index b557cf1a8f5f57c5f68dd2df32772f7072059156..8410fa56239dbee91a27989be8e1f50582d22455 100644
--- a/remoting/protocol/webrtc_connection_to_host.h
+++ b/remoting/protocol/webrtc_connection_to_host.h
@@ -5,10 +5,10 @@
#ifndef REMOTING_PROTOCOL_WEBRTC_CONNECTION_TO_HOST_H_
#define REMOTING_PROTOCOL_WEBRTC_CONNECTION_TO_HOST_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "remoting/protocol/channel_dispatcher_base.h"
#include "remoting/protocol/clipboard_filter.h"
#include "remoting/protocol/connection_to_host.h"
@@ -38,7 +38,7 @@ class WebrtcConnectionToHost : public ConnectionToHost,
void set_clipboard_stub(ClipboardStub* clipboard_stub) override;
void set_video_renderer(VideoRenderer* video_renderer) override;
void set_audio_stub(AudioStub* audio_stub) override;
- void Connect(scoped_ptr<Session> session,
+ void Connect(std::unique_ptr<Session> session,
scoped_refptr<TransportContext> transport_context,
HostEventCallback* event_callback) override;
const SessionConfig& config() override;
@@ -76,15 +76,15 @@ class WebrtcConnectionToHost : public ConnectionToHost,
VideoRenderer* video_renderer_ = nullptr;
ClipboardStub* clipboard_stub_ = nullptr;
- scoped_ptr<Session> session_;
- scoped_ptr<WebrtcTransport> transport_;
+ std::unique_ptr<Session> session_;
+ std::unique_ptr<WebrtcTransport> transport_;
- scoped_ptr<ClientControlDispatcher> control_dispatcher_;
- scoped_ptr<ClientEventDispatcher> event_dispatcher_;
+ std::unique_ptr<ClientControlDispatcher> control_dispatcher_;
+ std::unique_ptr<ClientEventDispatcher> event_dispatcher_;
ClipboardFilter clipboard_forwarder_;
InputFilter event_forwarder_;
- scoped_ptr<WebrtcVideoRendererAdapter> video_adapter_;
+ std::unique_ptr<WebrtcVideoRendererAdapter> video_adapter_;
// Internal state of the connection.
State state_ = INITIALIZING;
« no previous file with comments | « remoting/protocol/webrtc_connection_to_client.cc ('k') | remoting/protocol/webrtc_connection_to_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698