Automatically set the overscan insets if the output has the flag and no preference is set.

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 105 matching lines @@
 
   // RootWindowObserver overrides:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& new_size) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest,
                            NativeDisplaysChangedAfterPrimaryChange);
+  FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets);
   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 {
+    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;
+
+    // True if we detect that the display has overscan area. False if the
+    // display doesn't have it, or failed to detect it.
+    bool has_overscan;
+
+    // True if the |overscan_insets_in_dip| is specified. This is set because
+    // the user may specify an empty inset intentionally.
+    bool has_custom_overscan_insets;
   };
 
   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);
 
   // Set the 1st display as an internal display and returns the display Id for
   // the internal display.
   int64 SetFirstDisplayAsInternalDisplayForTest();
 
   // Checks if the mouse pointer is on one of displays, and moves to
   // the center of the nearest display if it's outside of all displays.
   void EnsurePointerInDisplays();
 
-  // Updates |display_names_| by calling platform-dependent functions.
-  void RefreshDisplayNames();
+  // Updates |display_info_| by calling platform-dependent functions.
+  void RefreshDisplayInfo();
 
   // Update the display's id in the |display_list| to match the ones
   // stored in this display manager's |displays_|. This is used to
   // emulate display change behavior during the test byn creating the
   // display list with the same display ids but with different bounds
   void SetDisplayIdsForTest(DisplayList* display_list) const;
 
+  // Forcibly specify 'has_overscan' flag of the DisplayInfo for specified |id|.
+  void SetHasOverscanFlagForTest(int64 id, bool has_overscan);
+
   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 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_