| Index: ash/wm/window_resizer.cc
|
| diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc
|
| index e48ee5270f9877817387cfc63731884d62d8b3fd..94d1891d48518cf54911cc4a92a68ac0209a5fea 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);
|
|
|