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

Unified Diff: remoting/host/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/desktop_capturer_proxy.cc ('k') | remoting/host/desktop_process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_environment.h
diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
index 1ed5cd3cbde28e22491ce4da1c6581bbc7f1fce6..ec984c5a4467316cf2a36673d66388f93e289093 100644
--- a/remoting/host/desktop_environment.h
+++ b/remoting/host/desktop_environment.h
@@ -5,11 +5,11 @@
#ifndef REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
#define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
+#include <memory>
#include <string>
#include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
namespace base {
@@ -40,11 +40,12 @@ class DesktopEnvironment {
// Factory methods used to create audio/video capturers, event executor, and
// screen controls object for a particular desktop environment.
- virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() = 0;
- virtual scoped_ptr<InputInjector> CreateInputInjector() = 0;
- virtual scoped_ptr<ScreenControls> CreateScreenControls() = 0;
- virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() = 0;
- virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() = 0;
+ virtual std::unique_ptr<AudioCapturer> CreateAudioCapturer() = 0;
+ virtual std::unique_ptr<InputInjector> CreateInputInjector() = 0;
+ virtual std::unique_ptr<ScreenControls> CreateScreenControls() = 0;
+ virtual std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() = 0;
+ virtual std::unique_ptr<webrtc::MouseCursorMonitor>
+ CreateMouseCursorMonitor() = 0;
// Returns the set of all capabilities supported by |this|.
virtual std::string GetCapabilities() const = 0;
@@ -63,7 +64,7 @@ class DesktopEnvironmentFactory {
// the desktop environment could not be created for any reason (if the curtain
// failed to active for instance). |client_session_control| must outlive
// the created desktop environment.
- virtual scoped_ptr<DesktopEnvironment> Create(
+ virtual std::unique_ptr<DesktopEnvironment> Create(
base::WeakPtr<ClientSessionControl> client_session_control) = 0;
// Enables or disables the curtain mode.
« no previous file with comments | « remoting/host/desktop_capturer_proxy.cc ('k') | remoting/host/desktop_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698