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

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

Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove HDCI stuff Created 5 years, 1 month 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_window.cc ('k') | ui/ozone/platform/drm/gpu/hardware_display_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/hardware_display_controller.h
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_controller.h b/ui/ozone/platform/drm/gpu/hardware_display_controller.h
index a561908564fb38d217a8984ffb2b08e3d8e5ee0f..3dccd6326b58fb9fbae14a2a584c78f720bfcd74 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_controller.h
+++ b/ui/ozone/platform/drm/gpu/hardware_display_controller.h
@@ -149,8 +149,8 @@ class OZONE_EXPORT HardwareDisplayController {
uint64_t GetTimeOfLastFlip() const;
- const std::vector<CrtcController*>& crtc_controllers() const {
- return crtc_controllers_.get();
+ const std::vector<scoped_ptr<CrtcController>>& crtc_controllers() const {
+ return crtc_controllers_;
}
scoped_refptr<DrmDevice> GetAllocationDrmDevice() const;
@@ -165,7 +165,7 @@ class OZONE_EXPORT HardwareDisplayController {
// Stores the CRTC configuration. This is used to identify monitors and
// configure them.
- ScopedVector<CrtcController> crtc_controllers_;
+ std::vector<scoped_ptr<CrtcController>> crtc_controllers_;
// Location of the controller on the screen.
gfx::Point origin_;
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_window.cc ('k') | ui/ozone/platform/drm/gpu/hardware_display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698