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

Unified Diff: remoting/protocol/fake_desktop_capturer.cc

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_desktop_capturer.h ('k') | remoting/protocol/fake_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/fake_desktop_capturer.cc
diff --git a/remoting/protocol/fake_desktop_capturer.cc b/remoting/protocol/fake_desktop_capturer.cc
index 290ef4903580a33c6ca862d0423902119cf588ab..5817715d899a2cb6e8a5f4d8633625e817d58d7d 100644
--- a/remoting/protocol/fake_desktop_capturer.cc
+++ b/remoting/protocol/fake_desktop_capturer.cc
@@ -41,7 +41,7 @@ class DefaultFrameGenerator
box_speed_y_(kSpeed),
first_frame_(true) {}
- scoped_ptr<webrtc::DesktopFrame> GenerateFrame(
+ std::unique_ptr<webrtc::DesktopFrame> GenerateFrame(
webrtc::SharedMemoryFactory* shared_memory_factory);
private:
@@ -58,10 +58,10 @@ class DefaultFrameGenerator
DISALLOW_COPY_AND_ASSIGN(DefaultFrameGenerator);
};
-scoped_ptr<webrtc::DesktopFrame> DefaultFrameGenerator::GenerateFrame(
+std::unique_ptr<webrtc::DesktopFrame> DefaultFrameGenerator::GenerateFrame(
webrtc::SharedMemoryFactory* shared_memory_factory) {
const int kBytesPerPixel = webrtc::DesktopFrame::kBytesPerPixel;
- scoped_ptr<webrtc::DesktopFrame> frame;
+ std::unique_ptr<webrtc::DesktopFrame> frame;
if (shared_memory_factory) {
int buffer_size = kWidth * kHeight * kBytesPerPixel;
frame.reset(new webrtc::SharedMemoryDesktopFrame(
@@ -147,7 +147,7 @@ void FakeDesktopCapturer::SetSharedMemoryFactory(
void FakeDesktopCapturer::Capture(const webrtc::DesktopRegion& region) {
base::Time capture_start_time = base::Time::Now();
- scoped_ptr<webrtc::DesktopFrame> frame =
+ std::unique_ptr<webrtc::DesktopFrame> frame =
frame_generator_.Run(shared_memory_factory_.get());
if (frame) {
frame->set_capture_time_ms(
« no previous file with comments | « remoting/protocol/fake_desktop_capturer.h ('k') | remoting/protocol/fake_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698