Treat displays with and without EDID the same way

ui/ozone/platform/dri/display_snapshot_dri.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/dri/display_snapshot_dri.h"
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <xf86drmMode.h>
 
@@ skipping 49 matching lines @@
   return false;
 }
 
 }  // namespace
 
 DisplaySnapshotDri::DisplaySnapshotDri(DriWrapper* drm,
                                        drmModeConnector* connector,
                                        drmModeCrtc* crtc,
                                        uint32_t index)
     : DisplaySnapshot(index,
-                      false,
                       gfx::Point(crtc->x, crtc->y),
                       gfx::Size(connector->mmWidth, connector->mmHeight),
                       GetDisplayType(connector),
                       IsAspectPreserving(drm, connector),
                       false,
                       std::string(),
                       std::vector<const DisplayMode*>(),
                       NULL,
                       NULL),
       connector_(connector->connector_id),
       crtc_(crtc->crtc_id),
       dpms_property_(drm->GetProperty(connector, "DPMS")) {
   if (!dpms_property_)
     VLOG(1) << "Failed to find the DPMS property for connector "
             << connector->connector_id;
 
   ScopedDrmPropertyBlobPtr edid_blob(drm->GetPropertyBlob(connector, "EDID"));
 
   if (edid_blob) {
     std::vector<uint8_t> edid(
         static_cast<uint8_t*>(edid_blob->data),
         static_cast<uint8_t*>(edid_blob->data) + edid_blob->length);
 
-    has_proper_display_id_ = GetDisplayIdFromEDID(edid, index, &display_id_);
+    if (!GetDisplayIdFromEDID(edid, index, &display_id_))
+      display_id_ = index;
+
     ParseOutputDeviceData(edid, NULL, &display_name_);
     ParseOutputOverscanFlag(edid, &overscan_flag_);
   } else {
     VLOG(1) << "Failed to get EDID blob for connector "
             << connector->connector_id;
   }
 
   for (int i = 0; i < connector->count_modes; ++i) {
     drmModeModeInfo& mode = connector->modes[i];
     modes_.push_back(new DisplayModeDri(mode));
@@ skipping 18 matching lines @@
   return base::StringPrintf(
       "[type=%d, connector=%" PRIu32 ", crtc=%" PRIu32 ", mode=%s, dim=%s]",
       type_,
       connector_,
       crtc_,
       current_mode_ ? current_mode_->ToString().c_str() : "NULL",
       physical_size_.ToString().c_str());
 }
 
 }  // namespace ui