Undo all existing overscan settings before updating to a new overscan settings (2nd)

ash/display/display_manager.h

 // 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.
 
 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_
 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 68 matching lines @@
   // Returns the current overscan insets for the specified |display_id|.
   // Returns an empty insets (0, 0, 0, 0) if no insets are specified for
   // the display.
   gfx::Insets GetOverscanInsets(int64 display_id) const;
 
   // Called when display configuration has changed. The new display
   // configurations is passed as a vector of Display object, which
   // contains each display's new infomration.
   void OnNativeDisplaysChanged(const std::vector<gfx::Display>& displays);
 
+  // Updates the internal display data and notifies observers about the changes.
+  void UpdateDisplays(const std::vector<gfx::Display>& displays);
+
   // Create a root window for given |display|.
   aura::RootWindow* CreateRootWindowForDisplay(const gfx::Display& display);
 
   // Obsoleted: Do not use in new code.
   // Returns the display at |index|. The display at 0 is
   // no longer considered "primary".
   gfx::Display* GetDisplayAt(size_t index);
 
   size_t GetNumDisplays() const;
 
@@ skipping 21 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest,
                            NativeDisplaysChangedAfterPrimaryChange);
   friend class ash::AcceleratorControllerTest;
   friend class test::DisplayManagerTestApi;
   friend class DisplayManagerTest;
   friend class test::SystemGestureEventFilterTest;
 
   typedef std::vector<gfx::Display> DisplayList;
 
+  // Metadata for each display.
+  struct DisplayInfo {
+    // The cached name of the display.
+    std::string name;
+
+    // The original bounds_in_pixel for the display.  This can be different from
+    // the current one in case of overscan insets.
+    gfx::Rect original_bounds_in_pixel;
+
+    // The overscan insets for the display.
+    gfx::Insets overscan_insets_in_dip;
+  };
+
   void Init();
   void CycleDisplayImpl();
   void ScaleDisplayImpl();
 
   gfx::Display& FindDisplayForRootWindow(const aura::RootWindow* root);
   gfx::Display& FindDisplayForId(int64 id);
 
   // Refer to |aura::DisplayManager::CreateDisplayFromSpec| API for
   // the format of |spec|.
   void AddDisplayFromSpec(const std::string& spec);
@@ skipping 17 matching lines @@
 
   DisplayList displays_;
 
   int64 internal_display_id_;
 
   // An internal display cache used when the internal display is disconnectd.
   scoped_ptr<gfx::Display> internal_display_;
 
   bool force_bounds_changed_;
 
-  // The mapping from the display ID to its overscan insets.
-  std::map<int64, gfx::Insets> overscan_mapping_;
-
-  // The cached display's name for the display ID.
-  std::map<int64, std::string> display_names_;
+  // The mapping from the display ID to its internal data.
+  std::map<int64, DisplayInfo> display_info_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 extern const aura::WindowProperty<int64>* const kDisplayIdKey;
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_