Fix bug 105565: Panels should adjust max size and full size if display changes

Changes in this patch:
1) We use same max size for both docked and detach panels.
2) When work area gets changed, we update max size, full size and current size if needed.
  2.1) If the panel has not been user-resized, max size is propotional to the work area and will get updated when work area changes.
  2.2) If the panel has been user-resized, max size will be kept as long as it does not exceed the work area size.

BUG=105565
TEST=New tests plus manual test by changing screen resolution and verifying panel sizes.

Review URL: https://chromiumcodereview.appspot.com/10356007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135761 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 2 deletions

diff --git a/chrome/browser/ui/panels/display_settings_provider.cc b/chrome/browser/ui/panels/display_settings_provider.cc
index 61f7709..f6b538a 100644
--- a/chrome/browser/ui/panels/display_settings_provider.cc
+++ b/chrome/browser/ui/panels/display_settings_provider.cc
@@ -71,8 +71,18 @@ gfx::Rect DisplaySettingsProvider::GetDisplayArea() {
 gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
 #if defined(OS_MACOSX)
   // On OSX, panels should be dropped all the way to the bottom edge of the
-  // screen (and overlap Dock).
-  gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().bounds();
+  // screen (and overlap Dock). And we also want to exclude the system menu
+  // area. Note that the rect returned from gfx::Screen util functions is in
+  // platform-independent screen coordinates with (0, 0) as the top-left corner.
+  gfx::Monitor monitor = gfx::Screen::GetPrimaryMonitor();
+  gfx::Rect monitor_area = monitor.bounds();
+  gfx::Rect work_area = monitor.work_area();
+  int system_menu_height = work_area.y() - monitor_area.y();
+  if (system_menu_height > 0) {
+    monitor_area.set_y(monitor_area.y() + system_menu_height);
+    monitor_area.set_height(monitor_area.height() - system_menu_height);
+  }
+  return monitor_area;
 #else
   gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
 #endif