Detect and fix overlapping displays

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

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 340 matching lines @@
       if (profile_name.empty())
         continue;
       auto color_profile_dict = base::MakeUnique<base::DictionaryValue>();
       color_profile_dict->SetInteger("profileId", color_profile);
       color_profile_dict->SetString("name", profile_name);
       available_color_profiles->Append(std::move(color_profile_dict));
     }
     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(
             "parentId", base::Int64ToString(placement.parent_display_id));
         js_display->SetInteger("layoutType", placement.position);
         js_display->SetInteger("offset", placement.offset);
       }
     }
 
     js_displays->Append(std::move(js_display));
@@ skipping 206 matching lines @@
   if (!args->GetBoolean(0, &enable))
     NOTREACHED();
 
   GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
       enable ? display::DisplayManager::UNIFIED
              : display::DisplayManager::EXTENDED);
 }
 
 }  // namespace options
 }  // namespace chromeos