Detect and fix overlapping displays

ui/display/manager/display_manager.h

Index: ui/display/manager/display_manager.h
diff --git a/ui/display/manager/display_manager.h b/ui/display/manager/display_manager.h
index 8437a3f1e9e944df527412bb6ddd7258351f0e93..1fc154dd1ba1d1a529e371d44828eb9ef12123df 100644
--- a/ui/display/manager/display_manager.h
+++ b/ui/display/manager/display_manager.h
@@ -124,6 +124,9 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
   // Returns the display layout used for current displays.
   const DisplayLayout& GetCurrentDisplayLayout() const;
 
+  // Returns the actual display layout after it has been resolved and applied.
+  const DisplayLayout& GetCurrentResolvedDisplayLayout() const;
+
   // Returns the current display list.
   DisplayIdList GetCurrentDisplayIdList() const;
 
@@ -408,7 +411,7 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
 
   // Applies the |layout| and updates the bounds of displays in |display_list|.
   // |updated_ids| contains the ids for displays whose bounds have changed.
-  void ApplyDisplayLayout(const DisplayLayout& layout,
+  void ApplyDisplayLayout(DisplayLayout* layout,
                           Displays* display_list,
                           std::vector<int64_t>* updated_ids);
 
@@ -418,6 +421,8 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
 
   std::unique_ptr<DisplayLayoutStore> layout_store_;
 
+  std::unique_ptr<DisplayLayout> current_resolved_layout_;
+
   int64_t first_display_id_ = kInvalidDisplayId;
 
   // List of current active displays.