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

Unified Diff: remoting/host/win/session_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/win/session_desktop_environment.h ('k') | remoting/host/win/session_input_injector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/win/session_desktop_environment.cc
diff --git a/remoting/host/win/session_desktop_environment.cc b/remoting/host/win/session_desktop_environment.cc
index 9d9f8b2ba371604a742f5f7e344a8bef4563d047..dc19f1d8a0b14b93320a877f9607baee8b60f377 100644
--- a/remoting/host/win/session_desktop_environment.cc
+++ b/remoting/host/win/session_desktop_environment.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "remoting/host/audio_capturer.h"
#include "remoting/host/input_injector.h"
@@ -18,10 +19,11 @@ namespace remoting {
SessionDesktopEnvironment::~SessionDesktopEnvironment() {}
-scoped_ptr<InputInjector> SessionDesktopEnvironment::CreateInputInjector() {
+std::unique_ptr<InputInjector>
+SessionDesktopEnvironment::CreateInputInjector() {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
- return make_scoped_ptr(new SessionInputInjectorWin(
+ return base::WrapUnique(new SessionInputInjectorWin(
input_task_runner(),
InputInjector::Create(input_task_runner(), ui_task_runner()),
ui_task_runner(), inject_sas_));
@@ -57,11 +59,11 @@ SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory(
SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() {}
-scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create(
+std::unique_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create(
base::WeakPtr<ClientSessionControl> client_session_control) {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
- scoped_ptr<SessionDesktopEnvironment> desktop_environment(
+ std::unique_ptr<SessionDesktopEnvironment> desktop_environment(
new SessionDesktopEnvironment(caller_task_runner(),
video_capture_task_runner(),
input_task_runner(), ui_task_runner(),
« no previous file with comments | « remoting/host/win/session_desktop_environment.h ('k') | remoting/host/win/session_input_injector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698