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

Unified Diff: content/browser/compositor/software_output_device_ozone.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: content/browser/compositor/software_output_device_ozone.h
diff --git a/content/browser/compositor/software_output_device_ozone.h b/content/browser/compositor/software_output_device_ozone.h
index 60476d811aeea8c73679ccdcdeea49495b2cb5fe..00990e091c5d2d1af71607cc5d26f312aec43884 100644
--- a/content/browser/compositor/software_output_device_ozone.h
+++ b/content/browser/compositor/software_output_device_ozone.h
@@ -5,8 +5,9 @@
#ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
#define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "cc/output/software_output_device.h"
#include "content/common/content_export.h"
#include "ui/gfx/native_widget_types.h"
@@ -24,7 +25,7 @@ namespace content {
class CONTENT_EXPORT SoftwareOutputDeviceOzone
: public cc::SoftwareOutputDevice {
public:
- static scoped_ptr<SoftwareOutputDeviceOzone> Create(
+ static std::unique_ptr<SoftwareOutputDeviceOzone> Create(
ui::Compositor* compositor);
~SoftwareOutputDeviceOzone() override;
@@ -37,7 +38,7 @@ class CONTENT_EXPORT SoftwareOutputDeviceOzone
explicit SoftwareOutputDeviceOzone(ui::Compositor* compositor);
ui::Compositor* compositor_;
- scoped_ptr<ui::SurfaceOzoneCanvas> surface_ozone_;
+ std::unique_ptr<ui::SurfaceOzoneCanvas> surface_ozone_;
DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone);
};
« no previous file with comments | « content/browser/compositor/software_output_device_mus.cc ('k') | content/browser/compositor/software_output_device_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698