Detect and fix overlapping displays

chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
index bb94fc92e3d38026028175e44615fa523638c5bd..8122d4fcb23b10fe171c4248f24ddb33f4fd0f9c 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
@@ -358,8 +358,10 @@ void DisplayOptionsHandler::SendAllDisplayInfo() {
     js_display->Set("availableColorProfiles", available_color_profiles);
 
     if (display_manager->GetNumDisplays() > 1) {
+      // The settings UI must use the resolved display layout to show the
+      // actual applied layout.
       const display::DisplayPlacement placement =
-          display_manager->GetCurrentDisplayLayout().FindPlacementById(
+          display_manager->GetCurrentResolvedDisplayLayout().FindPlacementById(

[stevenjb, 2017/01/31 21:58:56]

We need to make a similar change to display_info_provider_chromeos.cc

[afakhry, 2017/01/31 23:23:43]

Done.

               display.id());
       if (placement.display_id != display::kInvalidDisplayId) {
         js_display->SetString(