[2/2][Ozone-Drm] Scan for displays on browser size during startup

ui/ozone/platform/drm/host/drm_display_host_manager.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/drm/host/drm_display_host_manager.h"
 
 #include <fcntl.h>
 #include <stdio.h>
 #include <xf86drm.h>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/worker_pool.h"
-#include "ui/display/types/display_snapshot.h"
 #include "ui/events/ozone/device/device_event.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/ozone/common/display_snapshot_proxy.h"
 #include "ui/ozone/common/display_util.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
+#include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/host/drm_device_handle.h"
 #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
 #include "ui/ozone/platform/drm/host/drm_native_display_delegate.h"
 
 namespace ui {
 
 namespace {
 
 typedef base::Callback<void(const base::FilePath&, scoped_ptr<DrmDeviceHandle>)>
     OnOpenDeviceReplyCallback;
@@ skipping 83 matching lines @@
     if (!handle->Initialize(primary_graphics_card_path_)) {
       LOG(FATAL) << "Failed to open primary graphics card";
       return;
     }
     drm_devices_.add(primary_graphics_card_path_, handle.Pass());
   }
 
   device_manager_->AddObserver(this);
   proxy_->RegisterHandler(this);
 
-  DisplaySnapshot_Params params;
-  bool success = false;
-  {
-    // The file generated by frecon that contains EDID for the 1st display.
-    const base::FilePath kEDIDFile("/tmp/display_info.bin");
-
-    // Just read it on current thread as this is necessary information
-    // to start. This access only tmpfs, which is fast.
-    // TODO(dnicoara|oshima): crbug.com/450886.
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-    success = CreateSnapshotFromEDIDFile(kEDIDFile, &params);
-  }
-
-  // Fallback to command line if the file doesn't exit or failed to read.
-  if (success || CreateSnapshotFromCommandLine(&params)) {
-    LOG_IF(ERROR, !success) << "Failed to read display_info.bin.";
-    DCHECK_NE(DISPLAY_CONNECTION_TYPE_NONE, params.type);
-    displays_.push_back(new DisplaySnapshotProxy(params));
-    has_dummy_display_ = true;
-  } else {
-    LOG(ERROR) << "Failed to obtain initial display info";
+  DrmDeviceHandle* handle = drm_devices_.get(primary_graphics_card_path_);
+  ScopedVector<HardwareDisplayControllerInfo> display_infos =
+      GetAvailableDisplayControllerInfos(handle->fd());
+  has_dummy_display_ = !display_infos.empty();
+  for (size_t i = 0; i < display_infos.size(); ++i) {
+    displays_.push_back(new DisplaySnapshotProxy(CreateDisplaySnapshotParams(
+        display_infos[i], handle->fd(), i, gfx::Point())));
   }
 }
 
 DrmDisplayHostManager::~DrmDisplayHostManager() {
   device_manager_->RemoveObserver(this);
   proxy_->UnregisterHandler(this);
 
   for (auto it = drm_devices_.begin(); it != drm_devices_.end(); ++it) {
     base::WorkerPool::PostTask(FROM_HERE,
                                base::Bind(&CloseDeviceOnWorkerThread,
@@ skipping 275 matching lines @@
     const GetDisplaysCallback& callback) const {
   callback.Run(displays_.get());
 }
 
 void DrmDisplayHostManager::NotifyDisplayDelegate() const {
   if (delegate_)
     delegate_->OnConfigurationChanged();
 }
 
 }  // namespace ui