summaryrefslogtreecommitdiffstats
path: root/ash/wm/window_resizer.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 22:21:47 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 22:21:47 +0000
commit2e236a564aa06711455408a2b13ac8f52ac79343 (patch)
tree04478bff847bfd8b6d90437bf79f41a5caf0b398 /ash/wm/window_resizer.cc
parent56827e84ada3c06d8533e01d2fa739f0cb432fa8 (diff)
downloadchromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.zip
chromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.tar.gz
chromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.tar.bz2
Relanding r144499:
Rename the remaining usage of Monitor to Display BUG=none TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=144499 Review URL: https://chromiumcodereview.appspot.com/10675011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_resizer.cc')
-rw-r--r--ash/wm/window_resizer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc
index 7e62d23..df28ec7 100644
--- a/ash/wm/window_resizer.cc
+++ b/ash/wm/window_resizer.cc
@@ -292,7 +292,7 @@ int WindowResizer::GetWidthForDrag(const Details& details,
*delta_x = -x_multiplier * (details.initial_bounds.width() - min_width);
}
- // And don't let the window go bigger than the monitor.
+ // And don't let the window go bigger than the display.
int max_width =
gfx::Screen::GetDisplayNearestWindow(details.window).bounds().width();
if (width > max_width) {
@@ -326,7 +326,7 @@ int WindowResizer::GetHeightForDrag(const Details& details,
*delta_y = -y_multiplier * (details.initial_bounds.height() - min_height);
}
- // And don't let the window go bigger than the monitor.
+ // And don't let the window go bigger than the display.
int max_height =
gfx::Screen::GetDisplayNearestWindow(details.window).bounds().height();
if (height > max_height) {