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

Unified Diff: remoting/host/ipc_desktop_environment.cc

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/host/ipc_desktop_environment.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/ipc_desktop_environment.cc
diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc
index a98a9f4666b22daf341285c8fa0cc1fb4c08e4aa..a5bb70f1b6937a3d36eb2c229ba8aac11dfda5a4 100644
--- a/remoting/host/ipc_desktop_environment.cc
+++ b/remoting/host/ipc_desktop_environment.cc
@@ -8,6 +8,7 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/process/process_handle.h"
#include "base/single_thread_task_runner.h"
#include "build/build_config.h"
@@ -42,24 +43,24 @@ IpcDesktopEnvironment::IpcDesktopEnvironment(
IpcDesktopEnvironment::~IpcDesktopEnvironment() {}
-scoped_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() {
+std::unique_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() {
return desktop_session_proxy_->CreateAudioCapturer();
}
-scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() {
+std::unique_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() {
return desktop_session_proxy_->CreateInputInjector();
}
-scoped_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() {
+std::unique_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() {
return desktop_session_proxy_->CreateScreenControls();
}
-scoped_ptr<webrtc::MouseCursorMonitor>
+std::unique_ptr<webrtc::MouseCursorMonitor>
IpcDesktopEnvironment::CreateMouseCursorMonitor() {
return desktop_session_proxy_->CreateMouseCursorMonitor();
}
-scoped_ptr<webrtc::DesktopCapturer>
+std::unique_ptr<webrtc::DesktopCapturer>
IpcDesktopEnvironment::CreateVideoCapturer() {
return desktop_session_proxy_->CreateVideoCapturer();
}
@@ -85,11 +86,11 @@ IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {}
-scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
+std::unique_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
base::WeakPtr<ClientSessionControl> client_session_control) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
- return make_scoped_ptr(new IpcDesktopEnvironment(
+ return base::WrapUnique(new IpcDesktopEnvironment(
audio_task_runner_, caller_task_runner_, io_task_runner_,
client_session_control, connector_factory_.GetWeakPtr(), curtain_enabled_,
supports_touch_events_));
« no previous file with comments | « remoting/host/ipc_desktop_environment.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698