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

Unified Diff: remoting/host/basic_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/backoff_timer_unittest.cc ('k') | remoting/host/basic_desktop_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/basic_desktop_environment.h
diff --git a/remoting/host/basic_desktop_environment.h b/remoting/host/basic_desktop_environment.h
index 5ed174ee6b4bf0925049b8ae540131a6e9645efb..8eb9e7100a1b9609fbb30d24ee67ebc1dd83fc4d 100644
--- a/remoting/host/basic_desktop_environment.h
+++ b/remoting/host/basic_desktop_environment.h
@@ -5,12 +5,12 @@
#ifndef REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_
#define REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "remoting/host/desktop_environment.h"
namespace webrtc {
@@ -28,11 +28,12 @@ class BasicDesktopEnvironment : public DesktopEnvironment {
~BasicDesktopEnvironment() 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;
@@ -86,7 +87,7 @@ class BasicDesktopEnvironment : public DesktopEnvironment {
// Also: it's dynamically allocated to avoid having to bring in
// desktop_capture_options.h which brings in X11 headers which causes hard to
// find build errors.
- scoped_ptr<webrtc::DesktopCaptureOptions> desktop_capture_options_;
+ std::unique_ptr<webrtc::DesktopCaptureOptions> desktop_capture_options_;
// True if the touch events capability should be offered.
const bool supports_touch_events_;
« no previous file with comments | « remoting/host/backoff_timer_unittest.cc ('k') | remoting/host/basic_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698