| Index: remoting/host/client_session.h
|
| diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
|
| index 0caf5e10ff326c5a96a646da80d90174ccfc2bef..a42e91e4edcc3741d30a1086852aae362865b612 100644
|
| --- a/remoting/host/client_session.h
|
| +++ b/remoting/host/client_session.h
|
| @@ -87,7 +87,7 @@ class ClientSession
|
| // All |HostExtension|s in |extensions| must outlive |this|.
|
| ClientSession(EventHandler* event_handler,
|
| scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
|
| - scoped_ptr<protocol::ConnectionToClient> connection,
|
| + std::unique_ptr<protocol::ConnectionToClient> connection,
|
| DesktopEnvironmentFactory* desktop_environment_factory,
|
| const base::TimeDelta& max_duration,
|
| scoped_refptr<protocol::PairingRegistry> pairing_registry,
|
| @@ -138,7 +138,7 @@ class ClientSession
|
|
|
| private:
|
| // Creates a proxy for sending clipboard events to the client.
|
| - scoped_ptr<protocol::ClipboardStub> CreateClipboardProxy();
|
| + std::unique_ptr<protocol::ClipboardStub> CreateClipboardProxy();
|
|
|
| void OnScreenSizeChanged(const webrtc::DesktopSize& size,
|
| const webrtc::DesktopVector& dpi);
|
| @@ -146,7 +146,7 @@ class ClientSession
|
| EventHandler* event_handler_;
|
|
|
| // The connection to the client.
|
| - scoped_ptr<protocol::ConnectionToClient> connection_;
|
| + std::unique_ptr<protocol::ConnectionToClient> connection_;
|
|
|
| std::string client_jid_;
|
|
|
| @@ -154,7 +154,7 @@ class ClientSession
|
| DesktopEnvironmentFactory* desktop_environment_factory_;
|
|
|
| // The DesktopEnvironment instance for this session.
|
| - scoped_ptr<DesktopEnvironment> desktop_environment_;
|
| + std::unique_ptr<DesktopEnvironment> desktop_environment_;
|
|
|
| // Filter used as the final element in the input pipeline.
|
| protocol::InputFilter host_input_filter_;
|
| @@ -193,12 +193,12 @@ class ClientSession
|
| scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
|
|
|
| // Objects responsible for sending video, audio and mouse shape.
|
| - scoped_ptr<AudioPump> audio_pump_;
|
| - scoped_ptr<protocol::VideoStream> video_stream_;
|
| - scoped_ptr<MouseShapePump> mouse_shape_pump_;
|
| + std::unique_ptr<AudioPump> audio_pump_;
|
| + std::unique_ptr<protocol::VideoStream> video_stream_;
|
| + std::unique_ptr<MouseShapePump> mouse_shape_pump_;
|
|
|
| // The set of all capabilities supported by the client.
|
| - scoped_ptr<std::string> client_capabilities_;
|
| + std::unique_ptr<std::string> client_capabilities_;
|
|
|
| // The set of all capabilities supported by the host.
|
| std::string host_capabilities_;
|
| @@ -207,16 +207,16 @@ class ClientSession
|
| std::string capabilities_;
|
|
|
| // Used to inject mouse and keyboard input and handle clipboard events.
|
| - scoped_ptr<InputInjector> input_injector_;
|
| + std::unique_ptr<InputInjector> input_injector_;
|
|
|
| // Used to apply client-requested changes in screen resolution.
|
| - scoped_ptr<ScreenControls> screen_controls_;
|
| + std::unique_ptr<ScreenControls> screen_controls_;
|
|
|
| // The pairing registry for PIN-less authentication.
|
| scoped_refptr<protocol::PairingRegistry> pairing_registry_;
|
|
|
| // Used to manage extension functionality.
|
| - scoped_ptr<HostExtensionSessionManager> extension_manager_;
|
| + std::unique_ptr<HostExtensionSessionManager> extension_manager_;
|
|
|
| // Set to true if the client was authenticated successfully.
|
| bool is_authenticated_;
|
|
|