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

Unified Diff: remoting/host/desktop_session_win.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/host/desktop_session_proxy.cc ('k') | remoting/host/desktop_session_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_win.h
diff --git a/remoting/host/desktop_session_win.h b/remoting/host/desktop_session_win.h
index 08752439d3b492c7b67b475345fdaede9c0a4dea..1ff42c7f0fb6379b6e81460f9b97dd6e2e9c2492 100644
--- a/remoting/host/desktop_session_win.h
+++ b/remoting/host/desktop_session_win.h
@@ -7,9 +7,10 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "base/win/scoped_handle.h"
@@ -41,7 +42,7 @@ class DesktopSessionWin
public WtsTerminalObserver {
public:
// Creates a desktop session instance that attaches to the physical console.
- static scoped_ptr<DesktopSession> CreateForConsole(
+ static std::unique_ptr<DesktopSession> CreateForConsole(
scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
scoped_refptr<AutoThreadTaskRunner> io_task_runner,
DaemonProcess* daemon_process,
@@ -49,7 +50,7 @@ class DesktopSessionWin
const ScreenResolution& resolution);
// Creates a desktop session instance that attaches to a virtual console.
- static scoped_ptr<DesktopSession> CreateForVirtualTerminal(
+ static std::unique_ptr<DesktopSession> CreateForVirtualTerminal(
scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
scoped_refptr<AutoThreadTaskRunner> io_task_runner,
DaemonProcess* daemon_process,
@@ -116,7 +117,7 @@ class DesktopSessionWin
base::win::ScopedHandle desktop_process_;
// Launches and monitors the desktop process.
- scoped_ptr<WorkerProcessLauncher> launcher_;
+ std::unique_ptr<WorkerProcessLauncher> launcher_;
// Used to unsubscribe from session attach and detach events.
WtsTerminalMonitor* monitor_;
« no previous file with comments | « remoting/host/desktop_session_proxy.cc ('k') | remoting/host/desktop_session_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698