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

Unified Diff: remoting/host/chromeos/skia_bitmap_desktop_frame.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
Index: remoting/host/chromeos/skia_bitmap_desktop_frame.h
diff --git a/remoting/host/chromeos/skia_bitmap_desktop_frame.h b/remoting/host/chromeos/skia_bitmap_desktop_frame.h
index 10ed31aad0cbd72e1af37f4e2c023e8dda86dd2d..f0bc86365130657548e4f96e44cb02867cdad172 100644
--- a/remoting/host/chromeos/skia_bitmap_desktop_frame.h
+++ b/remoting/host/chromeos/skia_bitmap_desktop_frame.h
@@ -4,8 +4,9 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
@@ -15,16 +16,16 @@ namespace remoting {
// Frame data is stored in a SkBitmap.
class SkiaBitmapDesktopFrame : public webrtc::DesktopFrame {
public:
- static SkiaBitmapDesktopFrame* Create(scoped_ptr<SkBitmap> bitmap);
+ static SkiaBitmapDesktopFrame* Create(std::unique_ptr<SkBitmap> bitmap);
~SkiaBitmapDesktopFrame() override;
private:
SkiaBitmapDesktopFrame(webrtc::DesktopSize size,
int stride,
uint8_t* data,
- scoped_ptr<SkBitmap> bitmap);
+ std::unique_ptr<SkBitmap> bitmap);
- scoped_ptr<SkBitmap> bitmap_;
+ std::unique_ptr<SkBitmap> bitmap_;
DISALLOW_COPY_AND_ASSIGN(SkiaBitmapDesktopFrame);
};
« no previous file with comments | « remoting/host/chromeos/mouse_cursor_monitor_aura.cc ('k') | remoting/host/chromeos/skia_bitmap_desktop_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698