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

Unified Diff: remoting/host/desktop_process.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_environment.h ('k') | remoting/host/desktop_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_process.h
diff --git a/remoting/host/desktop_process.h b/remoting/host/desktop_process.h
index 42467245b098bb6d16d19cfb20081a475ea7a5dd..c74133ead1058fe668b5a9581dca578cf8693d20 100644
--- a/remoting/host/desktop_process.h
+++ b/remoting/host/desktop_process.h
@@ -7,13 +7,13 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ipc/ipc_listener.h"
#include "remoting/host/desktop_session_agent.h"
@@ -53,7 +53,8 @@ class DesktopProcess : public DesktopSessionAgent::Delegate,
// Creates the desktop agent and required threads and IPC channels. Returns
// true on success.
- bool Start(scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory);
+ bool Start(
+ std::unique_ptr<DesktopEnvironmentFactory> desktop_environment_factory);
private:
// Crashes the process in response to a daemon's request. The daemon passes
@@ -70,14 +71,14 @@ class DesktopProcess : public DesktopSessionAgent::Delegate,
scoped_refptr<AutoThreadTaskRunner> input_task_runner_;
// Factory used to create integration components for use by |desktop_agent_|.
- scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory_;
+ std::unique_ptr<DesktopEnvironmentFactory> desktop_environment_factory_;
// Name of the IPC channel connecting the desktop process with the daemon
// process.
std::string daemon_channel_name_;
// IPC channel connecting the desktop process with the daemon process.
- scoped_ptr<IPC::ChannelProxy> daemon_channel_;
+ std::unique_ptr<IPC::ChannelProxy> daemon_channel_;
// Provides screen/audio capturing and input injection services for
// the network process.
« no previous file with comments | « remoting/host/desktop_environment.h ('k') | remoting/host/desktop_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698