diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 21:51:44 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 21:51:44 +0000 |
| commit | e72fa4d643005f438978d8a9c21272f3acd64061 (patch) | |
| tree | fabd135523ba0954c3c6b861dd21c5e165512580 /ash/wm/window_resizer.cc | |
| parent | f33386d952654acfad4f62029ece49f0e7ecb200 (diff) | |
| download | chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.zip chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.tar.gz chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.tar.bz2 | |
Revert r 144499 "Rename the remaining usage of Monitor to Display"
Temporarily reverting rename change to investigate 133784
TBR=oshima@chromium.org
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10689014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_resizer.cc')
| -rw-r--r-- | ash/wm/window_resizer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index df28ec7..7e62d23 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 display. + // And don't let the window go bigger than the monitor. 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 display. + // And don't let the window go bigger than the monitor. int max_height = gfx::Screen::GetDisplayNearestWindow(details.window).bounds().height(); if (height > max_height) { |