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

Unified Diff: remoting/host/it2me_desktop_environment.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
Index: remoting/host/it2me_desktop_environment.h
diff --git a/remoting/host/it2me_desktop_environment.h b/remoting/host/it2me_desktop_environment.h
index 54118bae3a8a8b60e48b405634b6c650e4a26b20..94f210ab1f4b7fb4156e63949531cd5b37474bfe 100644
--- a/remoting/host/it2me_desktop_environment.h
+++ b/remoting/host/it2me_desktop_environment.h
@@ -5,8 +5,9 @@
#ifndef REMOTING_HOST_IT2ME_DESKTOP_ENVIRONMENT_H_
#define REMOTING_HOST_IT2ME_DESKTOP_ENVIRONMENT_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/basic_desktop_environment.h"
@@ -33,13 +34,13 @@ class It2MeDesktopEnvironment : public BasicDesktopEnvironment {
private:
// Presents the continue window to the local user.
- scoped_ptr<HostWindow> continue_window_;
+ std::unique_ptr<HostWindow> continue_window_;
// Presents the disconnect window to the local user.
- scoped_ptr<HostWindow> disconnect_window_;
+ std::unique_ptr<HostWindow> disconnect_window_;
// Notifies the client session about the local mouse movements.
- scoped_ptr<LocalInputMonitor> local_input_monitor_;
+ std::unique_ptr<LocalInputMonitor> local_input_monitor_;
DISALLOW_COPY_AND_ASSIGN(It2MeDesktopEnvironment);
};
@@ -55,7 +56,7 @@ class It2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
~It2MeDesktopEnvironmentFactory() override;
// DesktopEnvironmentFactory interface.
- scoped_ptr<DesktopEnvironment> Create(
+ std::unique_ptr<DesktopEnvironment> Create(
base::WeakPtr<ClientSessionControl> client_session_control) override;
private:
« no previous file with comments | « remoting/host/it2me/it2me_native_messaging_host_unittest.cc ('k') | remoting/host/it2me_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698