Add support for virtual displays

ui/display/chromeos/update_display_configuration_task.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/display/chromeos/update_display_configuration_task.h"
 
 #include "ui/display/chromeos/configure_displays_task.h"
 #include "ui/display/chromeos/display_layout_manager.h"
 #include "ui/display/chromeos/display_util.h"
 #include "ui/display/types/display_snapshot.h"
@@ skipping 30 matching lines @@
 void UpdateDisplayConfigurationTask::Run() {
   delegate_->GetDisplays(
       base::Bind(&UpdateDisplayConfigurationTask::OnDisplaysUpdated,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void UpdateDisplayConfigurationTask::OnDisplaysUpdated(
     const std::vector<DisplaySnapshot*>& displays) {
   cached_displays_ = displays;
 
+  // Add virtual displays after retrieving the physical displays from the NDD.
+  cached_displays_.insert(cached_displays_.end(),
+                          virtual_display_snapshots_.begin(),
+                          virtual_display_snapshots_.end());
+
   if (cached_displays_.size() > 1 && background_color_argb_)
     delegate_->SetBackgroundColor(background_color_argb_);
 
   // If the user hasn't requested a display state, update it using the requested
   // power state.
   if (new_display_state_ == MULTIPLE_DISPLAY_STATE_INVALID)
     new_display_state_ = ChooseDisplayState();
 
   VLOG(1) << "OnDisplaysUpdated: new_display_state="
           << MultipleDisplayStateToString(new_display_state_)
@@ skipping 138 matching lines @@
         return layout_manager_->GetStateController()->GetStateForDisplayIds(
             cached_displays_);
       }
       NOTREACHED();
     }
   }
   return MULTIPLE_DISPLAY_STATE_INVALID;
 }
 
 }  // namespace ui