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

Unified Diff: remoting/host/me2me_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
« no previous file with comments | « remoting/host/mac/me2me_preference_pane.mm ('k') | remoting/host/me2me_desktop_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/me2me_desktop_environment.h
diff --git a/remoting/host/me2me_desktop_environment.h b/remoting/host/me2me_desktop_environment.h
index d6aee15f3f81237de82f3322f6612f25cf4512a6..38e06b7d616d1526bf0d7ebc3c4bcfc5f394150c 100644
--- a/remoting/host/me2me_desktop_environment.h
+++ b/remoting/host/me2me_desktop_environment.h
@@ -21,7 +21,7 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
~Me2MeDesktopEnvironment() override;
// DesktopEnvironment interface.
- scoped_ptr<ScreenControls> CreateScreenControls() override;
+ std::unique_ptr<ScreenControls> CreateScreenControls() override;
std::string GetCapabilities() const override;
protected:
@@ -42,13 +42,13 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
private:
// "Curtains" the session making sure it is disconnected from the local
// console.
- scoped_ptr<CurtainMode> curtain_;
+ std::unique_ptr<CurtainMode> curtain_;
// 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(Me2MeDesktopEnvironment);
};
@@ -64,7 +64,7 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
~Me2MeDesktopEnvironmentFactory() override;
// DesktopEnvironmentFactory interface.
- scoped_ptr<DesktopEnvironment> Create(
+ std::unique_ptr<DesktopEnvironment> Create(
base::WeakPtr<ClientSessionControl> client_session_control) override;
void SetEnableCurtaining(bool enable) override;
« no previous file with comments | « remoting/host/mac/me2me_preference_pane.mm ('k') | remoting/host/me2me_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698