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

Unified Diff: ui/ozone/platform/drm/gpu/drm_device_manager.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/ozone/platform/drm/gpu/drm_device.cc ('k') | ui/ozone/platform/drm/gpu/drm_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/drm_device_manager.h
diff --git a/ui/ozone/platform/drm/gpu/drm_device_manager.h b/ui/ozone/platform/drm/gpu/drm_device_manager.h
index a893f09e2adacf081128a23bf36aa6e9a2e71934..52f59ad845bffb1f518be43f7abb61d7927d7043 100644
--- a/ui/ozone/platform/drm/gpu/drm_device_manager.h
+++ b/ui/ozone/platform/drm/gpu/drm_device_manager.h
@@ -6,11 +6,11 @@
#define UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_
#include <map>
+#include <memory>
#include <vector>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/gfx/native_widget_types.h"
namespace base {
@@ -29,7 +29,7 @@ typedef std::vector<scoped_refptr<DrmDevice>> DrmDeviceVector;
// buffers for the window represented by the widget.
class DrmDeviceManager {
public:
- DrmDeviceManager(scoped_ptr<DrmDeviceGenerator> drm_device_generator);
+ DrmDeviceManager(std::unique_ptr<DrmDeviceGenerator> drm_device_generator);
~DrmDeviceManager();
// The first device registered is assumed to be the primary device.
@@ -53,7 +53,7 @@ class DrmDeviceManager {
const DrmDeviceVector& GetDrmDevices() const;
private:
- scoped_ptr<DrmDeviceGenerator> drm_device_generator_;
+ std::unique_ptr<DrmDeviceGenerator> drm_device_generator_;
DrmDeviceVector devices_;
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.cc ('k') | ui/ozone/platform/drm/gpu/drm_device_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698