diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-17 03:50:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-17 03:50:33 +0000 |
| commit | 42c0a0c6d7f217aa7b52a4f3452f74857d894229 (patch) | |
| tree | ac51dd0c4ee2e4cf8b3425ede7a78cb5a8da257c /ash/wm/window_resizer.cc | |
| parent | 0e62ba1500c67c29943d8ff3ea48d07599396e92 (diff) | |
| download | chromium_src-42c0a0c6d7f217aa7b52a4f3452f74857d894229.zip chromium_src-42c0a0c6d7f217aa7b52a4f3452f74857d894229.tar.gz chromium_src-42c0a0c6d7f217aa7b52a4f3452f74857d894229.tar.bz2 | |
Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.
BUG=130828
R=oshima@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10540123
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_resizer.cc')
| -rw-r--r-- | ash/wm/window_resizer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index 2d43e8b..7e62d23 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc @@ -202,7 +202,7 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( if (details.window_component == HTBOTTOM || details.window_component == HTBOTTOMRIGHT || details.window_component == HTBOTTOMLEFT) { - gfx::Rect work_area = gfx::Screen::GetMonitorNearestWindow( + gfx::Rect work_area = gfx::Screen::GetDisplayNearestWindow( details.window).work_area(); if (new_bounds.bottom() > work_area.bottom()) new_bounds.Inset(0, 0, 0, @@ -294,7 +294,7 @@ int WindowResizer::GetWidthForDrag(const Details& details, // And don't let the window go bigger than the monitor. int max_width = - gfx::Screen::GetMonitorNearestWindow(details.window).bounds().width(); + gfx::Screen::GetDisplayNearestWindow(details.window).bounds().width(); if (width > max_width) { width = max_width; *delta_x = -x_multiplier * (details.initial_bounds.width() - max_width); @@ -328,7 +328,7 @@ int WindowResizer::GetHeightForDrag(const Details& details, // And don't let the window go bigger than the monitor. int max_height = - gfx::Screen::GetMonitorNearestWindow(details.window).bounds().height(); + gfx::Screen::GetDisplayNearestWindow(details.window).bounds().height(); if (height > max_height) { height = max_height; *delta_y = -y_multiplier * (details.initial_bounds.height() - max_height); |