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

Unified Diff: ui/ozone/platform/drm/gpu/screen_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/page_flip_request.h ('k') | ui/ozone/platform/drm/gpu/screen_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/screen_manager.h
diff --git a/ui/ozone/platform/drm/gpu/screen_manager.h b/ui/ozone/platform/drm/gpu/screen_manager.h
index 59f81d2cdb00e0a70ef0bc49a707c08d1bd9da7b..1955597bf85a24c1ac82cd6b3ee9d7aa282115e0 100644
--- a/ui/ozone/platform/drm/gpu/screen_manager.h
+++ b/ui/ozone/platform/drm/gpu/screen_manager.h
@@ -65,11 +65,12 @@ class ScreenManager {
// Adds a window for |widget|. Note: |widget| should not be associated with a
// window when calling this function.
- void AddWindow(gfx::AcceleratedWidget widget, scoped_ptr<DrmWindow> window);
+ void AddWindow(gfx::AcceleratedWidget widget,
+ std::unique_ptr<DrmWindow> window);
// Removes the window for |widget|. Note: |widget| must have a window
// associated with it when calling this function.
- scoped_ptr<DrmWindow> RemoveWindow(gfx::AcceleratedWidget widget);
+ std::unique_ptr<DrmWindow> RemoveWindow(gfx::AcceleratedWidget widget);
// Returns the window associated with |widget|. Note: This function should be
// called only if a valid window has been associated with |widget|.
@@ -80,9 +81,10 @@ class ScreenManager {
void UpdateControllerToWindowMapping();
private:
- typedef std::vector<scoped_ptr<HardwareDisplayController>>
+ typedef std::vector<std::unique_ptr<HardwareDisplayController>>
HardwareDisplayControllers;
- typedef base::ScopedPtrHashMap<gfx::AcceleratedWidget, scoped_ptr<DrmWindow>>
+ typedef base::ScopedPtrHashMap<gfx::AcceleratedWidget,
+ std::unique_ptr<DrmWindow>>
WidgetToWindowMap;
// Returns an iterator into |controllers_| for the controller identified by
« no previous file with comments | « ui/ozone/platform/drm/gpu/page_flip_request.h ('k') | ui/ozone/platform/drm/gpu/screen_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698