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

Unified Diff: remoting/protocol/fake_desktop_capturer.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/protocol/fake_datagram_socket.cc ('k') | remoting/protocol/fake_desktop_capturer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/fake_desktop_capturer.h
diff --git a/remoting/protocol/fake_desktop_capturer.h b/remoting/protocol/fake_desktop_capturer.h
index 8cf294e2de77738d586f5aaa90e2969b66d12276..9b54fd664bc7055c95bf6c7b41b8df07dce583ba 100644
--- a/remoting/protocol/fake_desktop_capturer.h
+++ b/remoting/protocol/fake_desktop_capturer.h
@@ -5,9 +5,10 @@
#ifndef REMOTING_PROTOCOL_FAKE_DESKTOP_CAPTURER_H_
#define REMOTING_PROTOCOL_FAKE_DESKTOP_CAPTURER_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
#include "third_party/webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
@@ -26,7 +27,7 @@ class FakeDesktopCapturer : public webrtc::DesktopCapturer {
static const int kWidth = 800;
static const int kHeight = 600;
- typedef base::Callback<scoped_ptr<webrtc::DesktopFrame>(
+ typedef base::Callback<std::unique_ptr<webrtc::DesktopFrame>(
webrtc::SharedMemoryFactory* shared_memory_factory)>
FrameGenerator;
@@ -46,7 +47,7 @@ class FakeDesktopCapturer : public webrtc::DesktopCapturer {
Callback* callback_;
- scoped_ptr<webrtc::SharedMemoryFactory> shared_memory_factory_;
+ std::unique_ptr<webrtc::SharedMemoryFactory> shared_memory_factory_;
DISALLOW_COPY_AND_ASSIGN(FakeDesktopCapturer);
};
« no previous file with comments | « remoting/protocol/fake_datagram_socket.cc ('k') | remoting/protocol/fake_desktop_capturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698