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

Unified Diff: remoting/host/desktop_capturer_proxy.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/daemon_process_win.cc ('k') | remoting/host/desktop_capturer_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_capturer_proxy.h
diff --git a/remoting/host/desktop_capturer_proxy.h b/remoting/host/desktop_capturer_proxy.h
index 51dd2fa11efa1b737690095772c9ae9f37d267c3..959fc399531d509c7125203bbcffbf7174638421 100644
--- a/remoting/host/desktop_capturer_proxy.h
+++ b/remoting/host/desktop_capturer_proxy.h
@@ -5,9 +5,10 @@
#ifndef REMOTING_HOST_DESKTOP_CAPTURER_PROXY_H_
#define REMOTING_HOST_DESKTOP_CAPTURER_PROXY_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
@@ -28,7 +29,7 @@ class DesktopCapturerProxy : public webrtc::DesktopCapturer {
public:
DesktopCapturerProxy(
scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
- scoped_ptr<webrtc::DesktopCapturer> capturer);
+ std::unique_ptr<webrtc::DesktopCapturer> capturer);
~DesktopCapturerProxy() override;
// webrtc::DesktopCapturer interface.
@@ -40,11 +41,11 @@ class DesktopCapturerProxy : public webrtc::DesktopCapturer {
private:
class Core;
- void OnFrameCaptured(scoped_ptr<webrtc::DesktopFrame> frame);
+ void OnFrameCaptured(std::unique_ptr<webrtc::DesktopFrame> frame);
base::ThreadChecker thread_checker_;
- scoped_ptr<Core> core_;
+ std::unique_ptr<Core> core_;
scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner_;
webrtc::DesktopCapturer::Callback* callback_;
« no previous file with comments | « remoting/host/daemon_process_win.cc ('k') | remoting/host/desktop_capturer_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698