diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 20:03:41 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 20:03:41 +0000 |
commit | b82c42c45ee1b113377a2800b36d6e5e05b8b8e1 (patch) | |
tree | 6034126ffc720a18cabc0bdb211de7ca10233670 /ash/wm/window_resizer.cc | |
parent | ce8d264d556f06a4b46b58b95bc82a884bb315d0 (diff) | |
download | chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.zip chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.tar.gz chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.tar.bz2 |
* Separated implementation class from gfx::Screen
* Moved Monitor class to gfx/.
* Converted all use of gfx::Screen to match new API
BUG=115347,111990
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9960042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_resizer.cc')
-rw-r--r-- | ash/wm/window_resizer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index e48ee52..94d1891 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc @@ -203,8 +203,8 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( if (details.window_component == HTBOTTOM || details.window_component == HTBOTTOMRIGHT || details.window_component == HTBOTTOMLEFT) { - gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestWindow( - details.window); + gfx::Rect work_area = gfx::Screen::GetMonitorNearestWindow( + details.window).work_area(); if (new_bounds.bottom() > work_area.bottom()) new_bounds.Inset(0, 0, 0, new_bounds.bottom() - work_area.bottom()); @@ -295,7 +295,7 @@ int WindowResizer::GetWidthForDrag(const Details& details, // And don't let the window go bigger than the monitor. int max_width = - gfx::Screen::GetMonitorAreaNearestWindow(details.window).width(); + gfx::Screen::GetMonitorNearestWindow(details.window).bounds().width(); if (width > max_width) { width = max_width; *delta_x = -x_multiplier * (details.initial_bounds.width() - max_width); @@ -329,7 +329,7 @@ int WindowResizer::GetHeightForDrag(const Details& details, // And don't let the window go bigger than the monitor. int max_height = - gfx::Screen::GetMonitorAreaNearestWindow(details.window).height(); + gfx::Screen::GetMonitorNearestWindow(details.window).bounds().height(); if (height > max_height) { height = max_height; *delta_y = -y_multiplier * (details.initial_bounds.height() - max_height); |