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: ui/ozone/platform/drm/common/drm_util.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: 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
Index: ui/ozone/platform/drm/common/drm_util.h
diff --git a/ui/ozone/platform/drm/common/drm_util.h b/ui/ozone/platform/drm/common/drm_util.h
index 463095738c37f727b5a2eac2a5b87e64694fef9f..c9f30e71ad31dbc2f064bcbbdb194122209e6ac3 100644
--- a/ui/ozone/platform/drm/common/drm_util.h
+++ b/ui/ozone/platform/drm/common/drm_util.h
@@ -27,7 +27,6 @@ class HardwareDisplayControllerInfo {
HardwareDisplayControllerInfo(ScopedDrmConnectorPtr connector,
ScopedDrmCrtcPtr crtc,
size_t index);
- ~HardwareDisplayControllerInfo();
drmModeConnector* connector() const { return connector_.get(); }
drmModeCrtc* crtc() const { return crtc_.get(); }
@@ -37,13 +36,11 @@ class HardwareDisplayControllerInfo {
ScopedDrmConnectorPtr connector_;
ScopedDrmCrtcPtr crtc_;
size_t index_;
-
- DISALLOW_COPY_AND_ASSIGN(HardwareDisplayControllerInfo);
};
// Looks-up and parses the native display configurations returning all available
// displays.
-ScopedVector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
+std::vector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
int fd);
bool SameMode(const drmModeModeInfo& lhs, const drmModeModeInfo& rhs);
@@ -53,7 +50,7 @@ DisplayMode_Params CreateDisplayModeParams(const drmModeModeInfo& mode);
// |info| provides the DRM information related to the display, |fd| is the
// connection to the DRM device.
DisplaySnapshot_Params CreateDisplaySnapshotParams(
- HardwareDisplayControllerInfo* info,
+ const HardwareDisplayControllerInfo& info,
int fd,
size_t device_index,
const gfx::Point& origin);

Powered by Google App Engine
This is Rietveld 408576698