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

Unified Diff: remoting/client/software_video_renderer.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/client/server_log_entry_client_unittest.cc ('k') | remoting/client/software_video_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/software_video_renderer.h
diff --git a/remoting/client/software_video_renderer.h b/remoting/client/software_video_renderer.h
index 5951cf3d954b792f9c0570bd6bf9104aadf229bf..ed9c837fca76225bfcc08d90daea8f6c2d695c11 100644
--- a/remoting/client/software_video_renderer.h
+++ b/remoting/client/software_video_renderer.h
@@ -7,9 +7,10 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "remoting/protocol/performance_tracker.h"
@@ -55,20 +56,20 @@ class SoftwareVideoRenderer : public protocol::VideoRenderer,
protocol::FrameConsumer* GetFrameConsumer() override;
// protocol::VideoStub interface.
- void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
+ void ProcessVideoPacket(std::unique_ptr<VideoPacket> packet,
const base::Closure& done) override;
private:
void RenderFrame(int32_t frame_id,
const base::Closure& done,
- scoped_ptr<webrtc::DesktopFrame> frame);
+ std::unique_ptr<webrtc::DesktopFrame> frame);
void OnFrameRendered(int32_t frame_id, const base::Closure& done);
scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_;
protocol::FrameConsumer* consumer_;
protocol::PerformanceTracker* perf_tracker_;
- scoped_ptr<VideoDecoder> decoder_;
+ std::unique_ptr<VideoDecoder> decoder_;
webrtc::DesktopSize source_size_;
webrtc::DesktopVector source_dpi_;
« no previous file with comments | « remoting/client/server_log_entry_client_unittest.cc ('k') | remoting/client/software_video_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698