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

Unified Diff: remoting/host/ipc_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/ipc_audio_capturer.cc ('k') | remoting/host/ipc_desktop_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/ipc_desktop_environment.h
diff --git a/remoting/host/ipc_desktop_environment.h b/remoting/host/ipc_desktop_environment.h
index 81b6a18bf79705ae62a8b79319b395ad15eec42f..337734a49f66effadae864df3122027a99ddbfa1 100644
--- a/remoting/host/ipc_desktop_environment.h
+++ b/remoting/host/ipc_desktop_environment.h
@@ -6,12 +6,12 @@
#define REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
#include <map>
+#include <memory>
#include <string>
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/desktop_environment.h"
#include "remoting/host/desktop_session_connector.h"
@@ -48,11 +48,12 @@ class IpcDesktopEnvironment : public DesktopEnvironment {
~IpcDesktopEnvironment() override;
// DesktopEnvironment implementation.
- scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
- scoped_ptr<InputInjector> CreateInputInjector() override;
- scoped_ptr<ScreenControls> CreateScreenControls() override;
- scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
- scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() override;
+ std::unique_ptr<AudioCapturer> CreateAudioCapturer() override;
+ std::unique_ptr<InputInjector> CreateInputInjector() override;
+ std::unique_ptr<ScreenControls> CreateScreenControls() override;
+ std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
+ std::unique_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
+ override;
std::string GetCapabilities() const override;
void SetCapabilities(const std::string& capabilities) override;
@@ -78,7 +79,7 @@ class IpcDesktopEnvironmentFactory
~IpcDesktopEnvironmentFactory() override;
// DesktopEnvironmentFactory implementation.
- scoped_ptr<DesktopEnvironment> Create(
+ std::unique_ptr<DesktopEnvironment> Create(
base::WeakPtr<ClientSessionControl> client_session_control) override;
void SetEnableCurtaining(bool enable) override;
bool SupportsAudioCapture() const override;
« no previous file with comments | « remoting/host/ipc_audio_capturer.cc ('k') | remoting/host/ipc_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698