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

Unified Diff: remoting/host/desktop_session_agent.cc

Issue 1946553002: WebRTC's scoped_ptr and scoped_ptr.h are going away, so stop using them (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/host/desktop_capturer_proxy.cc ('k') | remoting/protocol/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index ef13bed9f722e528f3dae29a909b2f6ec1f874b9..e7ab06325e9342f3678ff5b944fc7bf0399f4dc7 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -117,7 +117,7 @@ class SharedMemoryFactoryImpl : public webrtc::SharedMemoryFactory {
SharedMemoryFactoryImpl(const SendMessageCallback& send_message_callback)
: send_message_callback_(send_message_callback) {}
- rtc::scoped_ptr<webrtc::SharedMemory> CreateSharedMemory(
+ std::unique_ptr<webrtc::SharedMemory> CreateSharedMemory(
size_t size) override {
base::Closure release_buffer_callback =
base::Bind(send_message_callback_,
@@ -143,7 +143,7 @@ class SharedMemoryFactoryImpl : public webrtc::SharedMemoryFactory {
buffer->size())));
}
- return rtc::scoped_ptr<webrtc::SharedMemory>(buffer.release());
+ return std::move(buffer);
}
private:
@@ -315,7 +315,7 @@ void DesktopSessionAgent::OnStartSessionAgent(
video_capturer_ = desktop_environment_->CreateVideoCapturer();
video_capturer_->Start(this);
video_capturer_->SetSharedMemoryFactory(
- rtc::scoped_ptr<webrtc::SharedMemoryFactory>(new SharedMemoryFactoryImpl(
+ std::unique_ptr<webrtc::SharedMemoryFactory>(new SharedMemoryFactoryImpl(
base::Bind(&DesktopSessionAgent::SendToNetwork, this))));
mouse_cursor_monitor_ = desktop_environment_->CreateMouseCursorMonitor();
mouse_cursor_monitor_->Init(this, webrtc::MouseCursorMonitor::SHAPE_ONLY);
« no previous file with comments | « remoting/host/desktop_capturer_proxy.cc ('k') | remoting/protocol/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698