Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3341)

Unified Diff: ash/wm/window_resizer.cc

Issue 10540123: Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_manager_unittest.cc ('k') | ash/wm/window_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_resizer.cc
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc
index 2d43e8b8a9fee16531865250a9082cf6c4f0954c..7e62d23b35b0fafdbec94bc343fdcbd6c6bdb670 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);
« no previous file with comments | « ash/wm/window_manager_unittest.cc ('k') | ash/wm/window_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698