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

Unified Diff: ui/ozone/platform/drm/host/drm_display_host_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
Index: ui/ozone/platform/drm/host/drm_display_host_manager.h
diff --git a/ui/ozone/platform/drm/host/drm_display_host_manager.h b/ui/ozone/platform/drm/host/drm_display_host_manager.h
index fbe10ef6394479008c5791fb36f4c0699bcdda5c..557ac5dec198131163a468be19ab2224d8682365 100644
--- a/ui/ozone/platform/drm/host/drm_display_host_manager.h
+++ b/ui/ozone/platform/drm/host/drm_display_host_manager.h
@@ -8,12 +8,12 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <queue>
#include "base/file_descriptor_posix.h"
#include "base/files/scoped_file.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "ui/display/types/native_display_delegate.h"
@@ -87,7 +87,7 @@ class DrmDisplayHostManager : public DeviceEventObserver, GpuThreadObserver {
// are responsible for dequing the event and scheduling the next event.
void OnAddGraphicsDevice(const base::FilePath& path,
const base::FilePath& sysfs_path,
- scoped_ptr<DrmDeviceHandle> handle);
+ std::unique_ptr<DrmDeviceHandle> handle);
void OnUpdateGraphicsDevice();
void OnRemoveGraphicsDevice(const base::FilePath& path);
@@ -110,7 +110,7 @@ class DrmDisplayHostManager : public DeviceEventObserver, GpuThreadObserver {
// when there is no connection to the GPU to update the displays.
bool has_dummy_display_ = false;
- std::vector<scoped_ptr<DrmDisplayHost>> displays_;
+ std::vector<std::unique_ptr<DrmDisplayHost>> displays_;
GetDisplaysCallback get_displays_callback_;
@@ -134,7 +134,7 @@ class DrmDisplayHostManager : public DeviceEventObserver, GpuThreadObserver {
// This is used to cache the primary DRM device until the channel is
// established.
- scoped_ptr<DrmDeviceHandle> primary_drm_device_handle_;
+ std::unique_ptr<DrmDeviceHandle> primary_drm_device_handle_;
base::WeakPtrFactory<DrmDisplayHostManager> weak_ptr_factory_;
« no previous file with comments | « ui/ozone/platform/drm/host/drm_display_host.cc ('k') | ui/ozone/platform/drm/host/drm_display_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698