Add support for a virtual display on ChromeOS

ui/display/chromeos/display_configurator.cc

Index: ui/display/chromeos/display_configurator.cc
diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/chromeos/display_configurator.cc
index 1c84046cb7c8574c7bc81c6965d33d1573104365..e6d8461568d8e30975147f6e71b540b0dbf55139 100644
--- a/ui/display/chromeos/display_configurator.cc
+++ b/ui/display/chromeos/display_configurator.cc
@@ -9,12 +9,14 @@
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
+#include "ui/display/chromeos/display_snapshot_virtual.h"
 #include "ui/display/chromeos/display_util.h"
 #include "ui/display/chromeos/update_display_configuration_task.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/native_display_delegate.h"
+#include "ui/gfx/display.h"
 
 namespace ui {
 
@@ -142,6 +144,14 @@ DisplayConfigurator::DisplayLayoutManagerImpl::ParseDisplays(
     cached_displays.push_back(display_state);
   }
 
+  // Add virtual display if activated.
+  if (configurator_->IsVirtualDisplayEnabled()) {
+    DisplayState display_state;
+    configurator_->virtual_display_snapshot_->set_display_id(snapshots.size());
+    display_state.display = configurator_->virtual_display_snapshot_.get();
+    cached_displays.push_back(display_state);
+  }
+
   // Set |selected_mode| fields.
   for (size_t i = 0; i < cached_displays.size(); ++i) {
     DisplayState* display_state = &cached_displays[i];
@@ -594,6 +604,7 @@ bool DisplayConfigurator::ApplyProtections(const ContentProtections& requests) {
       case DISPLAY_CONNECTION_TYPE_INTERNAL:
       case DISPLAY_CONNECTION_TYPE_VGA:
       case DISPLAY_CONNECTION_TYPE_NETWORK:
+      case DISPLAY_CONNECTION_TYPE_VIRTUAL:
         // No protections for these types. Do nothing.
         break;
       case DISPLAY_CONNECTION_TYPE_NONE:
@@ -670,6 +681,7 @@ bool DisplayConfigurator::QueryContentProtectionStatus(
       case DISPLAY_CONNECTION_TYPE_INTERNAL:
       case DISPLAY_CONNECTION_TYPE_VGA:
       case DISPLAY_CONNECTION_TYPE_NETWORK:
+      case DISPLAY_CONNECTION_TYPE_VIRTUAL:
         // No protections for these types. Do nothing.
         break;
       case DISPLAY_CONNECTION_TYPE_NONE:
@@ -736,7 +748,8 @@ DisplayConfigurator::GetAvailableColorCalibrationProfiles(int64_t display_id) {
           switches::kDisableDisplayColorCalibration)) {
     for (size_t i = 0; i < cached_displays_.size(); ++i) {
       if (cached_displays_[i].display &&
-          cached_displays_[i].display->display_id() == display_id) {
+          cached_displays_[i].display->display_id() == display_id &&
+          IsPhysicalDisplayType(cached_displays_[i].display->type())) {
         return native_display_delegate_->GetAvailableColorCalibrationProfiles(
             *cached_displays_[i].display);
       }
@@ -751,7 +764,8 @@ bool DisplayConfigurator::SetColorCalibrationProfile(
     ui::ColorCalibrationProfile new_profile) {
   for (size_t i = 0; i < cached_displays_.size(); ++i) {
     if (cached_displays_[i].display &&
-        cached_displays_[i].display->display_id() == display_id) {
+        cached_displays_[i].display->display_id() == display_id &&
+        IsPhysicalDisplayType(cached_displays_[i].display->type())) {
       return native_display_delegate_->SetColorCalibrationProfile(
           *cached_displays_[i].display, new_profile);
     }
@@ -1013,6 +1027,32 @@ void DisplayConfigurator::NotifyObservers(
   }
 }
 
+void DisplayConfigurator::EnableVirtualDisplay(gfx::Size display_size) {
+  DCHECK(!IsVirtualDisplayEnabled()) << "virtual display already enabled";
+  // The display_id will be updated after the real displays are enumerated.
+  virtual_display_snapshot_.reset(new DisplaySnapshotVirtual(
+      gfx::Display::kInvalidDisplayID, display_size));
+  ConfigureDisplays();
+}
+
+void DisplayConfigurator::DisableVirtualDisplay() {
+  DCHECK(IsVirtualDisplayEnabled()) << "virtual display not enabled";
+  virtual_display_snapshot_.reset();
+  ConfigureDisplays();
+}
+
+bool DisplayConfigurator::IsVirtualDisplayEnabled() const {
+  return virtual_display_snapshot_.get();
+}
+
+int64_t DisplayConfigurator::GetVirtualDisplayId() {
+  for (const auto& display : cached_displays_) {
+    if (display.display->type() == DISPLAY_CONNECTION_TYPE_VIRTUAL)
+      return display.display->display_id();
+  }
+  return gfx::Display::kInvalidDisplayID;
+}
+
 // static
 DisplayConfigurator* DisplayConfigurator::GetInstance() {
   return Singleton<DisplayConfigurator>::get();